AcitvityPub: fix Mention rendering

3 files changed, 34 insertions, 23 deletions

diff --git a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java b/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
index bd837eb8..aa329b0a 100644
--- a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
+++ b/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
@@ -215,22 +215,6 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
             note.setCc(Collections.singletonList(followersUri(msg.getUser())));
         }
         note.setPublished(msg.getTimestamp());
-        if (msg.isHtml()) {
-            note.setContent(msg.getText());
-        } else {
-            PebbleTemplate noteTemplate = pebbleEngine.getTemplate("layouts/note");
-            Map<String, Object> context = new HashMap<>();
-            context.put("msg", msg);
-            context.put("baseUri", baseUri);
-            try {
-                Writer writer = new StringWriter();
-                noteTemplate.evaluate(writer, context);
-                note.setContent(writer.toString());
-            } catch (IOException e) {
-                logger.warn("template not rendered, falling back");
-                note.setContent(MessageUtils.formatMessage(StringUtils.defaultString(msg.getText())));
-            }
-        }
         if (StringUtils.isNotBlank(msg.getAttachmentType())) {
             Image attachment = new Image();
             attachment.setId(msg.getAttachment().getMedium().getUrl());
@@ -252,11 +236,28 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
                 if (personContext.isPresent()) {
                     Person person = (Person) personContext.get();
                     note.getTags().add(new Mention(person.getUrl(), person.getPreferredUsername()));
+                    msg.getTo().setName(person.getPreferredUsername());
                 }
             }
         } else if (MessageUtils.isReply(msg)) {
             note.getTags().add(new Mention(personWebUri(msg.getTo()), msg.getTo().getName()));
         }
+        if (msg.isHtml()) {
+            note.setContent(msg.getText());
+        } else {
+            PebbleTemplate noteTemplate = pebbleEngine.getTemplate("layouts/note");
+            Map<String, Object> context = new HashMap<>();
+            context.put("msg", msg);
+            context.put("baseUri", baseUri);
+            try {
+                Writer writer = new StringWriter();
+                noteTemplate.evaluate(writer, context);
+                note.setContent(writer.toString());
+            } catch (IOException e) {
+                logger.warn("template not rendered, falling back");
+                note.setContent(MessageUtils.formatMessage(StringUtils.defaultString(msg.getText())));
+            }
+        }
         return note;
     }
 
diff --git a/juick-server/src/main/java/com/juick/server/SignatureManager.java b/juick-server/src/main/java/com/juick/server/SignatureManager.java
index 4fa6c5ff..f152796c 100644
--- a/juick-server/src/main/java/com/juick/server/SignatureManager.java
+++ b/juick-server/src/main/java/com/juick/server/SignatureManager.java
@@ -64,7 +64,7 @@ public class SignatureManager {
         //boolean valid = verifySignature(Signature.fromString(requestHeaders.getFirst("Signature")),
           //      keystoreManager.getPublicKey(), "POST", inbox.getPath(), headers);
         logger.info("Sending context: {}", jsonMapper.writeValueAsString(data));
-        ResponseEntity<Void> response = new RestTemplate().postForEntity(inbox, request, Void.class);
+        ResponseEntity<Void> response = apClient.postForEntity(inbox, request, Void.class);
         logger.info("accepted follower: {}", response.getStatusCodeValue());
     }
     public boolean verifySignature(String signatureString, URI actor, String method, String path, Map<String, String> headers) {
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index 8884beef..e9f42ee3 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -1720,15 +1720,25 @@ public class ServerTests {
         Note create2 = jsonMapper.readValue(noteStr, Note.class);
     }
     @Test
-    @Transactional
     public void activitySerialization() throws Exception {
+        Message msgNoTags = commandsManager.processCommand(ugnich, "people", emptyUri).getNewMessage().get();
+        String json = jsonMapper.writeValueAsString(Context.build(activityPubManager.makeNote(msgNoTags)));
         Message msg = commandsManager.processCommand(ugnich, "*shit happens", emptyUri).getNewMessage().get();
         Note note = activityPubManager.makeNote(msg);
-        String json = jsonMapper.writeValueAsString(Context.build(note));
-        Message reply = commandsManager.processCommand(freefd, String.format("#%d HI", msg.getMid()), emptyUri).getNewMessage().get();
-        json = jsonMapper.writeValueAsString(Context.build(activityPubManager.makeNote(reply)));
-        Message msgNoTags = commandsManager.processCommand(ugnich, "people", emptyUri).getNewMessage().get();
-        json = jsonMapper.writeValueAsString(Context.build(activityPubManager.makeNote(msgNoTags)));
+        json = jsonMapper.writeValueAsString(Context.build(note));
+        Note replyNote = new Note();
+        replyNote.setId("http://localhost:8080/n/2-1");
+        replyNote.setInReplyTo(activityPubManager.messageUri(msg));
+        replyNote.setAttributedTo("http://localhost:8080/u/freefd");
+        replyNote.setTo(Collections.singletonList(activityPubManager.personUri(ugnich)));
+        replyNote.setContent("HI");
+        Create create = new Create();
+        create.setActor("http://localhost:8080/u/freefd");
+        create.setObject(replyNote);
+        signatureManager.post((Person) signatureManager.getContext(URI.create("http://localhost:8080/u/freefd")).get(),
+                (Person) signatureManager.getContext(URI.create("http://localhost:8080/u/ugnich")).get(), create);
+        Message replyToExt = commandsManager.processCommand(ugnich, String.format("#%d/1 PSSH YOBA ETO TI", msg.getMid()), emptyUri).getNewMessage().get();
+        json = jsonMapper.writeValueAsString(Context.build(activityPubManager.makeNote(messagesService.getReply(replyToExt.getMid(), replyToExt.getRid()))));
     }
     @Test
     public void signingSpec() throws IOException {