Fix deserialisation and tests

2 files changed, 66 insertions, 2 deletions

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 8a49d96a..cf189799 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
@@ -1705,16 +1705,18 @@ public class ServerTests {
         Delete delete = jsonMapper.readValue(deleteJsonStr, Delete.class);
         int mid = messagesService.createMessage(ugnich.getUid(), "YO", "", null);
         User extUser = new User();
-        extUser.setUri(URI.create("https://ext.social/users/xwatt"));
+        extUser.setUri(URI.create("http://localhost:8080/users/xwatt"));
         int rid = messagesService.createReply(mid, 0, extUser, "PEOPLE", null);
         Message replyFromExt = messagesService.getReply(mid, rid);
-        String extMessageUri = "https://ext.social/statuses/12345";
+        String extMessageUri = "http://localhost:8080/statuses/12345";
         messagesService.updateReplyUri(replyFromExt, URI.create(extMessageUri));
         int rid2 = messagesService.createReply(mid, rid, ugnich, "HI", null);
 
         Message replyToExt = messagesService.getReply(mid, rid2);
         Note replyNote = activityPubManager.makeNote(replyToExt);
         assertThat(replyNote.getInReplyTo(), equalTo(extMessageUri));
+        String noteStr = IOUtils.toString(URI.create("classpath:mention.json"), StandardCharsets.UTF_8);
+        Note create2 = jsonMapper.readValue(noteStr, Note.class);
     }
     @Test
     public void activitySerialization() throws JsonProcessingException {
diff --git a/juick-server/src/test/resources/mention.json b/juick-server/src/test/resources/mention.json
new file mode 100644
index 00000000..c51265f1
--- /dev/null
+++ b/juick-server/src/test/resources/mention.json
@@ -0,0 +1,62 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://w3id.org/security/v1",
+    {
+      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+      "sensitive": "as:sensitive",
+      "movedTo": {
+        "@id": "as:movedTo",
+        "@type": "@id"
+      },
+      "Hashtag": "as:Hashtag",
+      "ostatus": "http://ostatus.org#",
+      "atomUri": "ostatus:atomUri",
+      "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+      "conversation": "ostatus:conversation",
+      "toot": "http://joinmastodon.org/ns#",
+      "Emoji": "toot:Emoji",
+      "focalPoint": {
+        "@container": "@list",
+        "@id": "toot:focalPoint"
+      },
+      "featured": {
+        "@id": "toot:featured",
+        "@type": "@id"
+      },
+      "schema": "http://schema.org#",
+      "PropertyValue": "schema:PropertyValue",
+      "value": "schema:value"
+    }
+  ],
+  "id": "https://mastodonsocial.ru/users/inhosin/statuses/100946127454503070",
+  "type": "Note",
+  "summary": null,
+  "inReplyTo": "https://juick.com/n/2923741-40",
+  "published": "2018-10-23T17:27:45Z",
+  "url": "https://mastodonsocial.ru/@inhosin/100946127454503070",
+  "attributedTo": "https://mastodonsocial.ru/users/inhosin",
+  "to": [
+    "https://www.w3.org/ns/activitystreams#Public"
+  ],
+  "cc": [
+    "https://mastodonsocial.ru/users/inhosin/followers",
+    "https://juick.com/u/vt"
+  ],
+  "sensitive": false,
+  "atomUri": "https://mastodonsocial.ru/users/inhosin/statuses/100946127454503070",
+  "inReplyToAtomUri": "https://juick.com/n/2923741-40",
+  "conversation": "tag:mastodonsocial.ru,2018-10-16:objectId=609790:objectType=Conversation",
+  "content": "<p><span class=\"h-card\"><a href=\"https://juick.com/vt/\" class=\"u-url mention\">@<span>vt</span></a></span> а лайки между серверами ходят? И ещё вопрос: нельзя всёже в ответ транслировать ник, чтобы нотификация поступала, а то приходится лопатить ленту что искать ответы. Я сейчас тоже с ActivityPub ковыряюсь.</p>",
+  "contentMap": {
+    "ru": "<p><span class=\"h-card\"><a href=\"https://juick.com/vt/\" class=\"u-url mention\">@<span>vt</span></a></span> а лайки между серверами ходят? И ещё вопрос: нельзя всёже в ответ транслировать ник, чтобы нотификация поступала, а то приходится лопатить ленту что искать ответы. Я сейчас тоже с ActivityPub ковыряюсь.</p>"
+  },
+  "attachment": [],
+  "tag": [
+    {
+      "type": "Mention",
+      "href": "https://juick.com/u/vt",
+      "name": "@vt@juick.com"
+    }
+  ]
+}
\ No newline at end of file