ActivityPub: convert HTML to Markdown

2 files changed, 15 insertions, 2 deletions

diff --git a/src/main/java/com/juick/server/api/activity/Profile.java b/src/main/java/com/juick/server/api/activity/Profile.java
index 404f0f84..3e0179c8 100644
--- a/src/main/java/com/juick/server/api/activity/Profile.java
+++ b/src/main/java/com/juick/server/api/activity/Profile.java
@@ -29,6 +29,7 @@ import com.juick.server.www.WebApp;
 import com.juick.service.MessagesService;
 import com.juick.service.UserService;
 import com.juick.service.activities.*;
+import com.overzealous.remark.Remark;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,6 +83,8 @@ public class Profile {
     private ObjectMapper jsonMapper;
     @Inject
     private WebApp webApp;
+    @Inject
+    private Remark remarkConverter;
 
     @GetMapping(value = "/u/{userName}", produces = {Context.LD_JSON_MEDIA_TYPE, Context.ACTIVITYSTREAMS_PROFILE_MEDIA_TYPE})
     public Person getUser(@PathVariable String userName) {
@@ -301,7 +304,8 @@ public class Profile {
                                         Map<String, Object> attachmentObj = (Map<String, Object>) ((List<Object>) note.get("attachment")).get(0);
                                         attachment = (String) attachmentObj.get("url");
                                     }
-                                    CommandResult result = commandsManager.processCommand(user, String.format("#%s %s", postId, note.get("content")), URI.create(attachment));
+                                    String markdown = remarkConverter.convertFragment((String)note.get("content"));
+                                    CommandResult result = commandsManager.processCommand(user, String.format("#%s %s", postId, markdown), URI.create(attachment));
                                     logger.info(jsonMapper.writeValueAsString(result));
                                     if (result.getNewMessage().isPresent()) {
                                         messagesService.updateReplyUri(result.getNewMessage().get(), noteId);
@@ -319,7 +323,8 @@ public class Profile {
                                             Map<String, Object> attachmentObj = (Map<String, Object>) ((List<Object>) note.get("attachment")).get(0);
                                             attachment = (String) attachmentObj.get("url");
                                         }
-                                        CommandResult result = commandsManager.processCommand(user, String.format("#%d/%d %s", reply.getMid(), reply.getRid(), note.get("content")), URI.create(attachment));
+                                        String markdown = remarkConverter.convertFragment((String)note.get("content"));
+                                        CommandResult result = commandsManager.processCommand(user, String.format("#%d/%d %s", reply.getMid(), reply.getRid(), markdown), URI.create(attachment));
                                         logger.info(jsonMapper.writeValueAsString(result));
                                         if (result.getNewMessage().isPresent()) {
                                             messagesService.updateReplyUri(result.getNewMessage().get(), noteId);
diff --git a/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index 16693995..c8b88cd1 100644
--- a/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
@@ -18,6 +18,8 @@
 package com.juick.server.configuration;
 
 import com.juick.server.KeystoreManager;
+import com.overzealous.remark.Options;
+import com.overzealous.remark.Remark;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -71,4 +73,10 @@ public class BaseWebConfiguration implements WebMvcConfigurer, SchedulingConfigu
     public KeystoreManager keystoreManager() {
         return new KeystoreManager(keystore, keystorePassword);
     }
+    @Bean
+    public Remark remarkConverter() {
+        Options options = new Options();
+        options.inlineLinks = true;
+        return new Remark(options);
+    }
 }