From b67f2b80fad5413de4f7cd145942196cee861c63 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 4 Oct 2018 17:58:11 +0300 Subject: add Note endpoint --- juick-server/src/main/java/com/juick/server/ActivityPubManager.java | 5 +---- .../src/main/java/com/juick/server/api/activity/Profile.java | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'juick-server/src/main/java/com/juick') 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 e590f4f9..2e511738 100644 --- a/juick-server/src/main/java/com/juick/server/ActivityPubManager.java +++ b/juick-server/src/main/java/com/juick/server/ActivityPubManager.java @@ -20,7 +20,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; import javax.annotation.Nonnull; -import javax.annotation.PostConstruct; import javax.inject.Inject; import java.io.IOException; import java.net.URI; @@ -32,8 +31,6 @@ public class ActivityPubManager implements ActivityListener, NotificationListene @Inject SignatureManager signatureManager; @Inject - ActivityPubManager activityPubManager; - @Inject SocialService socialService; @Value("${ap_base_uri:http://localhost:8080/}") private String baseUri; @@ -173,7 +170,7 @@ public class ActivityPubManager implements ActivityListener, NotificationListene note.setInReplyTo(messageUri(msg.getMid(), msg.getReplyto())); } if (MessageUtils.isPM(msg)) { - note.setTo(Collections.singletonList(activityPubManager.personUri(msg.getTo()))); + note.setTo(Collections.singletonList(personUri(msg.getTo()))); } else { note.setTo(Collections.singletonList("https://www.w3.org/ns/activitystreams#Public")); note.setCc(Collections.singletonList(followersUri(msg.getUser()))); 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 bbb7761f..76b82d79 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 @@ -1,5 +1,6 @@ package com.juick.server.api.activity; +import com.juick.Message; import com.juick.User; import com.juick.server.ActivityPubManager; import com.juick.server.KeystoreManager; @@ -220,6 +221,11 @@ 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 processInbox(@RequestBody Activity activity, -- cgit v1.2.3