From ae2b7552bda919e7eb505139eb417656ae2568a1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 7 Oct 2018 13:14:33 +0300
Subject: ActivityPub: fix inReplyTo serialization

---
 .../src/main/java/com/juick/server/ActivityPubManager.java       | 4 ++--
 .../src/main/java/com/juick/service/MessagesServiceImpl.java     | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'juick-server/src/main/java')

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 c1790deb..10ca9951 100644
--- a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
+++ b/juick-server/src/main/java/com/juick/server/ActivityPubManager.java
@@ -183,8 +183,8 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
         note.setUrl(PlainTextFormatter.formatUrl(msg));
         note.setAttributedTo(personUri(msg.getUser()));
         if (MessageUtils.isReply(msg)) {
-            if (msg.getReplyUri().toASCIIString().length() > 0) {
-                note.setInReplyTo(msg.getReplyUri().toASCIIString());
+            if (msg.getReplyToUri().toASCIIString().length() > 0) {
+                note.setInReplyTo(msg.getReplyToUri().toASCIIString());
             } else {
                 note.setInReplyTo(messageUri(msg.getMid(), msg.getReplyto()));
             }
diff --git a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
index bb8e43f1..62cdff0c 100644
--- a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -367,7 +367,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                         + "replies.attach, replies.txt, IFNULL(q.txt,t.txt) as quote, "
                         + "COALESCE(q.user_id, m.user_id) AS to_uid, COALESCE(qu.nick, mu.nick) AS to_name, "
                         + "replies.updated_at, replies.user_uri as uri, "
-                        + "q.user_uri AS to_uri, replies.reply_uri AS reply_uri, replies.html "
+                        + "q.user_uri AS to_uri, replies.reply_uri AS reply_uri, replies.html, q.reply_uri "
                         + "FROM replies LEFT JOIN users ON replies.user_id = users.id "
                         + "LEFT JOIN replies q ON replies.message_id = q.message_id and replies.replyto = q.reply_id "
                         + "LEFT JOIN messages_txt t ON replies.message_id = t.message_id "
@@ -401,11 +401,12 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                     User quoteUser = new User();
                     quoteUser.setUid(quoteUid);
                     quoteUser.setName(Optional.ofNullable(rs.getString(9)).orElse(AnonymousUser.INSTANCE.getName()));
-                    quoteUser.setUri(URI.create(Optional.ofNullable(rs.getString(11)).orElse(StringUtils.EMPTY)));
+                    quoteUser.setUri(URI.create(Optional.ofNullable(rs.getString(12)).orElse(StringUtils.EMPTY)));
                     msg.setTo(quoteUser);
                     msg.setUpdatedAt(rs.getTimestamp(10).toInstant());
-                    msg.setReplyUri(URI.create(Optional.ofNullable(rs.getString(12)).orElse(StringUtils.EMPTY)));
-                    msg.setHtml(rs.getBoolean(13));
+                    msg.setReplyUri(URI.create(Optional.ofNullable(rs.getString(13)).orElse(StringUtils.EMPTY)));
+                    msg.setHtml(rs.getBoolean(14));
+                    msg.setReplyToUri(URI.create(Optional.ofNullable(rs.getString(15)).orElse(StringUtils.EMPTY)));
                     if (StringUtils.isNotEmpty(msg.getAttachmentType())) {
                         try {
                             imagesService.setAttachmentMetadata(baseImagesUrl, msg);
-- 
cgit v1.2.3