ActivityStreams: support both required content-types

2 files changed, 12 insertions, 10 deletions

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 c3f838ee..ef55edf1 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
@@ -33,7 +33,7 @@ public class Profile {
     @Value("${img_url:http://localhost:8080/i/}")
     private String baseImagesUri;
 
-    @GetMapping(value = "/u/{userName}", produces = ActivityObject.CONTENT_TYPE)
+    @GetMapping(value = "/u/{userName}", produces = { ActivityObject.LD_JSON_MEDIA_TYPE, ActivityObject.ACTIVITY_JSON_MEDIA_TYPE })
     public Person getUser(@PathVariable String userName) {
         User user = userService.getUserByName(userName);
         if (!user.isAnonymous()) {
@@ -47,16 +47,17 @@ public class Profile {
             person.setOutbox(uri.replacePath(String.format("/u/%s/blog/toc", userName)).toUriString());
             person.setFollowers(uri.replacePath(String.format("/u/%s/followers/toc", userName)).toUriString());
             person.setFollowing(uri.replacePath(String.format("/u/%s/following/toc", userName)).toUriString());
-            uri.replacePath(String.format("/a/%d.png", user.getUid()));
+            UriComponentsBuilder image = UriComponentsBuilder.fromUriString(baseImagesUri);
+            image.path(String.format("/a/%d.png", user.getUid()));
             Image avatar = new Image();
-            avatar.setUrl(uri.toUriString());
+            avatar.setUrl(image.toUriString());
             avatar.setMediaType("image/png");
             person.setIcon(avatar);
             return person;
         }
         throw new HttpNotFoundException();
     }
-    @GetMapping(value = "/u/{userName}/blog/toc", produces = ActivityObject.CONTENT_TYPE)
+    @GetMapping(value = "/u/{userName}/blog/toc", produces = { ActivityObject.LD_JSON_MEDIA_TYPE, ActivityObject.ACTIVITY_JSON_MEDIA_TYPE })
     public OrderedCollection getOutbox(@PathVariable String userName) {
         User user = userService.getUserByName(userName);
         if (!user.isAnonymous()) {
@@ -72,7 +73,7 @@ public class Profile {
         }
         throw new HttpNotFoundException();
     }
-    @GetMapping(value = "/u/{userName}/blog", produces = ActivityObject.CONTENT_TYPE)
+    @GetMapping(value = "/u/{userName}/blog", produces = { ActivityObject.LD_JSON_MEDIA_TYPE, ActivityObject.ACTIVITY_JSON_MEDIA_TYPE })
     public OrderedCollectionPage getOutboxPage(@PathVariable String userName,
                                            @RequestParam(required = false, defaultValue = "0") int before) {
         User visitor = UserUtils.getCurrentUser();
@@ -113,7 +114,7 @@ public class Profile {
         }
         throw new HttpNotFoundException();
     }
-    @GetMapping(value = "/u/{userName}/followers/toc", produces = ActivityObject.CONTENT_TYPE)
+    @GetMapping(value = "/u/{userName}/followers/toc", produces = { ActivityObject.LD_JSON_MEDIA_TYPE, ActivityObject.ACTIVITY_JSON_MEDIA_TYPE })
     public OrderedCollection getFollowers(@PathVariable String userName) {
         User user = userService.getUserByName(userName);
         if (!user.isAnonymous()) {
@@ -129,7 +130,7 @@ public class Profile {
         }
         throw new HttpNotFoundException();
     }
-    @GetMapping(value = "/u/{userName}/followers", produces = ActivityObject.CONTENT_TYPE)
+    @GetMapping(value = "/u/{userName}/followers", produces = { ActivityObject.LD_JSON_MEDIA_TYPE, ActivityObject.ACTIVITY_JSON_MEDIA_TYPE })
     public OrderedCollectionPage getFollowersPage(@PathVariable String userName,
                                                @RequestParam(required = false, defaultValue = "0") int page) {
         User user = userService.getUserByName(userName);
@@ -161,7 +162,7 @@ public class Profile {
         }
         throw new HttpNotFoundException();
     }
-    @GetMapping(value = "/u/{userName}/following/toc", produces = ActivityObject.CONTENT_TYPE)
+    @GetMapping(value = "/u/{userName}/following/toc", produces = { ActivityObject.LD_JSON_MEDIA_TYPE, ActivityObject.ACTIVITY_JSON_MEDIA_TYPE })
     public OrderedCollection getFollowing(@PathVariable String userName) {
         User user = userService.getUserByName(userName);
         if (!user.isAnonymous()) {
@@ -177,7 +178,7 @@ public class Profile {
         }
         throw new HttpNotFoundException();
     }
-    @GetMapping(value = "/u/{userName}/following", produces = ActivityObject.CONTENT_TYPE)
+    @GetMapping(value = "/u/{userName}/following", produces = { ActivityObject.LD_JSON_MEDIA_TYPE, ActivityObject.ACTIVITY_JSON_MEDIA_TYPE })
     public OrderedCollectionPage getFollowingPage(@PathVariable String userName,
                                                   @RequestParam(required = false, defaultValue = "0") int page) {
         User user = userService.getUserByName(userName);
diff --git a/juick-server/src/main/java/com/juick/server/api/activity/model/ActivityObject.java b/juick-server/src/main/java/com/juick/server/api/activity/model/ActivityObject.java
index c4672936..7859be86 100644
--- a/juick-server/src/main/java/com/juick/server/api/activity/model/ActivityObject.java
+++ b/juick-server/src/main/java/com/juick/server/api/activity/model/ActivityObject.java
@@ -28,7 +28,8 @@ public abstract class ActivityObject {
     }
 
     public final static String CONTEXT_URI = "https://www.w3.org/ns/activitystreams";
-    public final static String CONTENT_TYPE = "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"";
+    public final static String LD_JSON_MEDIA_TYPE = "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"";
+    public final static String ACTIVITY_JSON_MEDIA_TYPE = "application/activity+json; profile=\"https://www.w3.org/ns/activitystreams\"";
 
     public Instant getPublished() {
         return published;