Skip to content

The Unified and Autonomous Development Platform

Fix issue #404 - Support emoji on git history (gitmoji)

Robin Shena50f24728227
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index 35c2e0ff9c..a5a4131311 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -50,7 +50,6 @@ import io.onedev.server.util.init.InitStage;
import io.onedev.server.util.init.ManualConfig;
import io.onedev.server.util.jetty.JettyLauncher;
import io.onedev.server.util.schedule.TaskScheduler;
-import oshi.SystemInfo;
public class OneDev extends AbstractPlugin implements Serializable {
@@ -98,9 +97,6 @@ public class OneDev extends AbstractPlugin implements Serializable {
@Override
public void start() {
- logger.info("cpu: " + new SystemInfo().getHardware().getProcessor().getLogicalProcessorCount());
- logger.info("memory: " + new SystemInfo().getHardware().getMemory().getTotal()/1024/1024);
-
SecurityUtils.bindAsSystem();
System.setProperty("hsqldb.reconfig_logging", "false");
@@ -145,7 +141,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
public Url guessServerUrl(boolean ssh) {
Url serverUrl = null;
-
+
String serviceHost = System.getenv("ONEDEV_SERVICE_HOST");
if (serviceHost != null) { // we are running inside Kubernetes
Commandline kubectl = new Commandline("kubectl");
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 150f4a1150..1726cbcace 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -331,13 +331,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
private transient Collection<Build> currentBuilds;
- /**
- * Get title of this merge request.
- *
- * @return user specified title of this merge request, <tt>null</tt> for
- * auto-created merge request.
- */
- public @Nullable String getTitle() {
+ public String getTitle() {
return title;
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
index bfd1d3d574..4e7058f397 100644
--- a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
+++ b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
@@ -15,6 +15,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.PropertyChange;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;
@@ -41,7 +42,8 @@ public class ActivityDetail implements Serializable {
}
public Component render(String componentId) {
- return new Label(componentId, htmlVersion).setEscapeModelStrings(false);
+ return new Label(componentId, Emojis.getInstance().apply(htmlVersion))
+ .setEscapeModelStrings(false);
}
private static String compareAsHtml(Map<String, String> oldProperties, Map<String, String> newProperties,
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/Emojis.java b/server-core/src/main/java/io/onedev/server/web/asset/emoji/Emojis.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/Emojis.java
rename to server-core/src/main/java/io/onedev/server/web/asset/emoji/Emojis.java
index 40113ab21a..373116d597 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/Emojis.java
+++ b/server-core/src/main/java/io/onedev/server/web/asset/emoji/Emojis.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.markdown.emoji;
+package io.onedev.server.web.asset.emoji;
import java.io.IOException;
import java.io.InputStream;
@@ -7,6 +7,8 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -16,6 +18,8 @@ import io.onedev.server.OneDev;
public class Emojis {
+ private static final Pattern PATTERN = Pattern.compile(":(\\S+?):");
+
private final List<Emoji> emojis;
private final Map<String, String> unicodes;
@@ -66,6 +70,22 @@ public class Emojis {
return unicodes.keySet();
}
+ public String apply(String content) {
+ Matcher matcher = PATTERN.matcher(content);
+ StringBuffer buffer = new StringBuffer();
+ while (matcher.find()) {
+ String alias = matcher.group(1);
+ String unicode = getUnicode(alias);
+ if (unicode != null)
+ matcher.appendReplacement(buffer, unicode);
+ else
+ matcher.appendReplacement(buffer, matcher.group());
+ }
+ matcher.appendTail(buffer);
+
+ return buffer.toString();
+ }
+
public static class Emoji {
private final String unicode;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/emoji.json b/server-core/src/main/java/io/onedev/server/web/asset/emoji/emoji.json
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/emoji.json
rename to server-core/src/main/java/io/onedev/server/web/asset/emoji/emoji.json
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
index 8abd405f85..d8a8b9b65e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.build.log;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -16,9 +17,11 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.log.JobLogEntryEx;
+import io.onedev.server.buildspec.job.log.Message;
import io.onedev.server.model.Build;
import io.onedev.server.tasklog.JobLogManager;
import io.onedev.server.tasklog.LogSnippet;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.WebSocketObserver;
@SuppressWarnings("serial")
@@ -69,9 +72,17 @@ public class BuildLogPanel extends GenericPanel<Build> {
return OneDev.getInstance(JobLogManager.class);
}
- private String asJSON(Object obj) {
+ private String asJSON(List<JobLogEntryEx> entries) {
+ List<JobLogEntryEx> transformed = new ArrayList<>();
+ Emojis emojis = Emojis.getInstance();
+ for (JobLogEntryEx entry: entries) {
+ List<Message> messages = new ArrayList<>();
+ for (Message message: entry.getMessages())
+ messages.add(new Message(message.getStyle(), emojis.apply(message.getText())));
+ transformed.add(new JobLogEntryEx(entry.getDate(), messages));
+ }
try {
- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(obj);
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(transformed);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 21f8060850..809691e7d9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -38,6 +38,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.build.ParamValuesLabel;
import io.onedev.server.web.component.entity.reference.ReferencePanel;
@@ -383,7 +384,8 @@ public abstract class BuildSidePanel extends Panel {
Link<Void> link = new ViewStateAwarePageLink<Void>("title",
PullRequestActivitiesPage.class,
PullRequestActivitiesPage.paramsOf(request));
- link.add(new Label("label", "#" + request.getNumber() + " " + request.getTitle()));
+ String title = Emojis.getInstance().apply(request.getTitle());
+ link.add(new Label("label", "#" + request.getNumber() + " " + title));
add(link);
add(new RequestStatusBadge("status", new AbstractReadOnlyModel<PullRequest>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
index ecc129ff0c..993bb6fe3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
@@ -22,6 +22,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.util.Highlighter;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.ReferenceTransformer;
@@ -88,7 +89,7 @@ public abstract class CommitMessagePanel extends Panel {
@Override
protected String load() {
- return highlight(getCommit().getShortMessage(), commitUrl);
+ return Emojis.getInstance().apply(highlight(getCommit().getShortMessage(), commitUrl));
}
}).setEscapeModelStrings(false));
@@ -97,7 +98,7 @@ public abstract class CommitMessagePanel extends Panel {
@Override
public String getObject() {
- return highlight(GitUtils.getDetailMessage(getCommit()), null);
+ return Emojis.getInstance().apply(highlight(GitUtils.getDetailMessage(getCommit()), null));
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
index 4ba61ad837..263312c8fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
@@ -16,6 +16,7 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -41,7 +42,7 @@ public class IssueChoiceProvider extends ChoiceProvider<Issue> {
writer
.key("id").value(choice.getId())
.key("number").value(choice.getNumber())
- .key("title").value(HtmlEscape.escapeHtml5(choice.getTitle()));
+ .key("title").value(Emojis.getInstance().apply(HtmlEscape.escapeHtml5(choice.getTitle())));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 5cbed60d55..e765af39d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -80,6 +80,7 @@ import io.onedev.server.util.Input;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
@@ -1142,7 +1143,7 @@ public abstract class IssueListPanel extends Panel {
String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
IssueActivitiesPage.paramsOf(issue)).toString();
- String transformed = new ReferenceTransformer(issue.getProject(), url).apply(issue.getTitle());
+ String transformed = Emojis.getInstance().apply(new ReferenceTransformer(issue.getProject(), url).apply(issue.getTitle()));
fragment.add(new Label("title", transformed) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
index da0b8c34d7..104e952505 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
@@ -12,6 +12,7 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.page.project.ProjectPage;
@@ -42,11 +43,12 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
Issue issue = getModelObject();
+ Emojis emojis = Emojis.getInstance();
if (SecurityUtils.canAccess(issue.getProject())) {
String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
IssueActivitiesPage.paramsOf(issue)).toString();
ReferenceTransformer transformer = new ReferenceTransformer(issue.getProject(), url);
- String transformed = transformer.apply(issue.getTitle());
+ String transformed = emojis.apply(transformer.apply(issue.getTitle()));
String title;
if (issue.getProject().equals(project)) {
title = String.format("<a href='%s'>#%d</a> %s", url, issue.getNumber(), transformed);
@@ -57,7 +59,7 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
add(new Label("title", title).setEscapeModelStrings(false));
} else {
ReferenceTransformer transformer = new ReferenceTransformer(issue.getProject(), null);
- String transformed = transformer.apply(issue.getTitle());
+ String transformed = emojis.apply(transformer.apply(issue.getTitle()));
String title;
if (issue.getProject().equals(project))
title = "#" + issue.getNumber() + " " + transformed;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index 44a0a4208e..9c9d477332 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -17,6 +17,7 @@ import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.util.ReferenceTransformer;
@@ -106,7 +107,8 @@ public abstract class IssueTitlePanel extends Panel {
@Override
protected String load() {
ReferenceTransformer transformer = new ReferenceTransformer(getIssue().getProject(), null);
- return "#" + getIssue().getNumber() + "&nbsp;&nbsp;" + transformer.apply(getIssue().getTitle());
+ return "#" + getIssue().getNumber() + "&nbsp;&nbsp;"
+ + Emojis.getInstance().apply(transformer.apply(getIssue().getTitle()));
}
}).setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index d885f18259..be180583bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -62,11 +62,11 @@ import io.onedev.server.model.User;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.FilenameUtils;
import io.onedev.server.util.validation.ProjectNameValidator;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.markdown.emoji.Emojis;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
@@ -371,7 +371,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
Map<String, String> referenceMap = new HashMap<>();
referenceMap.put("referenceType", "issue");
referenceMap.put("referenceNumber", String.valueOf(issue.getNumber()));
- referenceMap.put("referenceTitle", issue.getTitle());
+ referenceMap.put("referenceTitle", Emojis.getInstance().apply(issue.getTitle()));
referenceMap.put("searchKey", issue.getNumber() + " " + StringUtils.deleteWhitespace(issue.getTitle()));
referenceList.add(referenceMap);
}
@@ -380,7 +380,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
Map<String, String> referenceMap = new HashMap<>();
referenceMap.put("referenceType", "pull request");
referenceMap.put("referenceNumber", String.valueOf(request.getNumber()));
- referenceMap.put("referenceTitle", request.getTitle());
+ referenceMap.put("referenceTitle", Emojis.getInstance().apply(request.getTitle()));
referenceMap.put("searchKey", request.getNumber() + " " + StringUtils.deleteWhitespace(request.getTitle()));
referenceList.add(referenceMap);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index c8def1bc4e..687f6095f8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -40,6 +40,7 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ColorUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.asset.lozad.LozadResourceReference;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
@@ -170,7 +171,8 @@ public class MarkdownViewer extends GenericPanel<String> {
if (issue != null && SecurityUtils.canAccess(issue.getProject())) {
String color = OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(issue.getState()).getColor();
String script = String.format("onedev.server.markdown.renderIssueTooltip('%s', '%s', '%s', '%s')",
- JavaScriptEscape.escapeJavaScript(issue.getTitle()), JavaScriptEscape.escapeJavaScript(issue.getState()),
+ Emojis.getInstance().apply(JavaScriptEscape.escapeJavaScript(issue.getTitle())),
+ JavaScriptEscape.escapeJavaScript(issue.getState()),
ColorUtils.isLight(color)? "black": "white", color);
target.appendJavaScript(script);
}
@@ -194,7 +196,8 @@ public class MarkdownViewer extends GenericPanel<String> {
}
String script = String.format("onedev.server.markdown.renderPullRequestTooltip('%s', '%s', '%s')",
- JavaScriptEscape.escapeJavaScript(request.getTitle()), status, statusCss);
+ Emojis.getInstance().apply(JavaScriptEscape.escapeJavaScript(request.getTitle())),
+ status, statusCss);
target.appendJavaScript(script);
}
break;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNodeRenderer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNodeRenderer.java
index f0a44046dd..89a68ff04e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNodeRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNodeRenderer.java
@@ -11,6 +11,8 @@ import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
import com.vladsch.flexmark.util.options.DataHolder;
+import io.onedev.server.web.asset.emoji.Emojis;
+
public class EmojiNodeRenderer implements NodeRenderer {
public EmojiNodeRenderer(DataHolder options) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
index 365dd443d7..1ee3e9361e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
@@ -16,6 +16,7 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
@@ -41,7 +42,7 @@ public class PullRequestChoiceProvider extends ChoiceProvider<PullRequest> {
writer
.key("id").value(choice.getId())
.key("number").value(choice.getNumber())
- .key("title").value(HtmlEscape.escapeHtml5(choice.getTitle()));
+ .key("title").value(Emojis.getInstance().apply(HtmlEscape.escapeHtml5(choice.getTitle())));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index abdda3549b..de6f817ef5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -68,6 +68,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
@@ -557,7 +558,8 @@ public abstract class PullRequestListPanel extends Panel {
ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), url);
- fragment.add(new Label("title", transformer.apply(request.getTitle())) {
+ String title = Emojis.getInstance().apply(transformer.apply(request.getTitle()));
+ fragment.add(new Label("title", title) {
@Override
public void renderHead(IHeaderResponse response) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
index f0c79ae5e4..75f638e0a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
@@ -23,6 +23,7 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.ReferenceTransformer;
@@ -76,7 +77,7 @@ class LastCommitsResource extends AbstractResource {
String url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
ReferenceTransformer transformer = new ReferenceTransformer(project, url);
- info.html = transformer.apply(value.getSummary());
+ info.html = Emojis.getInstance().apply(transformer.apply(value.getSummary()));
info.when = DateUtils.formatAge(value.getCommitDate());
PersonIdent author = value.getAuthor();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 231a089496..dc854985b5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -75,6 +75,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.util.ProjectAndBranch;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
@@ -538,7 +539,7 @@ public class ProjectBranchesPage extends ProjectPage {
PageParameters params = CommitDetailPage.paramsOf(getProject(), lastCommit.name());
String commitUrl = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
ReferenceTransformer transformer = new ReferenceTransformer(getProject(), commitUrl);
- return transformer.apply(lastCommit.getShortMessage());
+ return Emojis.getInstance().apply(transformer.apply(lastCommit.getShortMessage()));
}
}).setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 53a4a7bf77..785f503e95 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -74,6 +74,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.JobSecretAuthorizationContextAware;
import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.branch.create.CreateBranchLink;
import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
@@ -191,8 +192,10 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
protected void onInitialize() {
super.onInitialize();
+ Emojis emojis = Emojis.getInstance();
ReferenceTransformer transformer = new ReferenceTransformer(getProject(), null);
- add(new Label("title", transformer.apply(getCommit().getShortMessage())).setEscapeModelStrings(false));
+ String title = emojis.apply(transformer.apply(getCommit().getShortMessage()));
+ add(new Label("title", title).setEscapeModelStrings(false));
BlobIdent blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);
ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
@@ -219,10 +222,12 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
});
String message = GitUtils.getDetailMessage(getCommit());
- if (message != null)
- add(new Label("detail", transformer.apply(message)).setEscapeModelStrings(false));
- else
+ if (message != null) {
+ add(new Label("detail", emojis.apply(transformer.apply(message)))
+ .setEscapeModelStrings(false));
+ } else {
add(new WebMarkupContainer("detail").setVisible(false));
+ }
add(refsContainer = new AjaxLazyLoadPanel("refs") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index 8ffb2b355d..7e7a1c5cca 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -28,6 +28,7 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
@@ -213,7 +214,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
ReferenceTransformer transformer = new ReferenceTransformer(getIssue().getProject(), url);
- add(new Label("title", transformer.apply(getIssue().getTitle())) {
+ add(new Label("title", Emojis.getInstance().apply(transformer.apply(getIssue().getTitle()))) {
@Override
public void renderHead(IHeaderResponse response) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 86e819de22..e8d3a4fafc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -78,6 +78,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.branch.BranchLink;
@@ -181,7 +182,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected String load() {
PullRequest request = getPullRequest();
ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), null);
- String transformed = transformer.apply(request.getTitle());
+ String transformed = Emojis.getInstance().apply(transformer.apply(request.getTitle()));
return "#" + request.getNumber() + " - " + transformed;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index b460dbb164..75db671ca9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -59,6 +59,7 @@ import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
@@ -320,7 +321,7 @@ public class ProjectTagsPage extends ProjectPage {
annotatedFragment.add(new PersonIdentPanel("author", revTag.getTaggerIdent(), "Tagger", Mode.NAME));
else
annotatedFragment.add(new WebMarkupContainer("author").setVisible(false));
- Label message = new Label("message", revTag.getFullMessage());
+ Label message = new Label("message", Emojis.getInstance().apply(revTag.getFullMessage()));
message.setOutputMarkupId(true);
annotatedFragment.add(message);
String toggleScript = String.format("$('#%s').toggle();", message.getMarkupId());
@@ -342,7 +343,7 @@ public class ProjectTagsPage extends ProjectPage {
PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());
String commitUrl = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
ReferenceTransformer transformer = new ReferenceTransformer(getProject(), commitUrl);
- return transformer.apply(commit.getShortMessage());
+ return Emojis.getInstance().apply(transformer.apply(commit.getShortMessage()));
}
}).setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 7f40a4800c..09dc26145e 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -56,6 +56,7 @@ import io.onedev.server.util.interpolative.VariableInterpolator;
import io.onedev.server.util.match.PatternApplied;
import io.onedev.server.util.match.WildcardUtils;
import io.onedev.server.util.script.ScriptContribution;
+import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
public class SuggestionUtils {
@@ -248,8 +249,10 @@ public class SuggestionUtils {
public List<InputSuggestion> suggest(Project project, String matchWith) {
List<InputSuggestion> suggestions = new ArrayList<>();
if (SecurityUtils.canAccess(project)) {
- for (Issue issue: OneDev.getInstance(IssueManager.class).query(project, matchWith, count))
- suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null));
+ for (Issue issue: OneDev.getInstance(IssueManager.class).query(project, matchWith, count)) {
+ String title = Emojis.getInstance().apply(issue.getTitle());
+ suggestions.add(new InputSuggestion("#" + issue.getNumber(), title, null));
+ }
}
return suggestions;
}
@@ -265,8 +268,10 @@ public class SuggestionUtils {
List<InputSuggestion> suggestions = new ArrayList<>();
if (SecurityUtils.canReadCode(project)) {
PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);
- for (PullRequest request: pullRequestManager.query(project, matchWith, count))
- suggestions.add(new InputSuggestion("#" + request.getNumber(), request.getTitle(), null));
+ for (PullRequest request: pullRequestManager.query(project, matchWith, count)) {
+ String title = Emojis.getInstance().apply(request.getTitle());
+ suggestions.add(new InputSuggestion("#" + request.getNumber(), title, null));
+ }
}
return suggestions;
}
diff --git a/server-product/jsw/agent/wrapper.conf b/server-product/jsw/agent/wrapper.conf
index 90eec93a63..320c3f908e 100644
--- a/server-product/jsw/agent/wrapper.conf
+++ b/server-product/jsw/agent/wrapper.conf
@@ -59,8 +59,7 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=*.jar
-wrapper.java.classpath.2=../lib/agentVersion/io.onedev.*.jar
-wrapper.java.classpath.3=../lib/agentVersion/*.jar
+wrapper.java.classpath.2=../lib/agentVersion/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.conf
index bc1d95db16..cc66c15d7e 100644
--- a/server-product/jsw/wrapper.conf
+++ b/server-product/jsw/wrapper.conf
@@ -58,8 +58,7 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
-wrapper.java.classpath.1=io.onedev.*.jar
-wrapper.java.classpath.2=*.jar
+wrapper.java.classpath.1=*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)