From 0cb00c61bd1ab203c66878d3c313b6f40b4cc707 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 4 Oct 2018 19:33:03 +0300
Subject: fix some tests, disable Note endpoint until negotiation fixed

---
 .../src/main/java/com/juick/server/api/activity/Profile.java      | 3 ++-
 .../src/main/java/com/juick/service/MessagesServiceImpl.java      | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

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

diff --git a/juick-server/src/main/java/com/juick/server/api/activity/Profile.java b/juick-server/src/main/java/com/juick/server/api/activity/Profile.java
index 6fdd9d8c..5a269d03 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/Profile.java
+++ b/juick-server/src/main/java/com/juick/server/api/activity/Profile.java
@@ -221,11 +221,12 @@ public class Profile {
         }
         throw new HttpNotFoundException();
     }
+    /*
     @GetMapping(value = "/m/{mid}", produces = {Context.LD_JSON_MEDIA_TYPE, Context.ACTIVITY_JSON_MEDIA_TYPE})
     public Context showNote(@PathVariable int mid) {
         Message message = messagesService.getMessage(mid);
         return Context.build(activityPubManager.makeNote(message));
-    }
+    }*/
 
     @PostMapping(value = "/api/inbox", consumes = {Context.LD_JSON_MEDIA_TYPE, Context.ACTIVITY_JSON_MEDIA_TYPE})
     public ResponseEntity<Void> processInbox(@RequestBody Activity activity,
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 b0707232..e83e2705 100644
--- a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -392,7 +392,13 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                         msg.setTo(quoteUser);
                     }
                     msg.setUpdatedAt(rs.getTimestamp(10).toInstant());
-
+                    if (StringUtils.isNotEmpty(msg.getAttachmentType())) {
+                        try {
+                            imagesService.setAttachmentMetadata(baseImagesUrl, msg);
+                        } catch (Exception e) {
+                            logger.warn("exception reading images for mid {} rid {}", msg.getMid(), msg.getRid(), e);
+                        }
+                    }
                     return msg;
                 },
                 mid, rid);
-- 
cgit v1.2.3