ActivityPub: fix actor to user conversion, handle Block activity

1 files changed, 18 insertions, 8 deletions

diff --git a/src/main/java/com/juick/ActivityPubManager.java b/src/main/java/com/juick/ActivityPubManager.java
index 1dd3b784..9dc6a4f0 100644
--- a/src/main/java/com/juick/ActivityPubManager.java
+++ b/src/main/java/com/juick/ActivityPubManager.java
@@ -17,6 +17,9 @@
 
 package com.juick;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.juick.model.Message;
 import com.juick.model.Reaction;
 import com.juick.model.User;
@@ -69,6 +72,8 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
     ProfileUriBuilder profileUriBuilder;
     @Inject
     ConversionService conversionService;
+    @Inject
+    ObjectMapper jsonMapper;
 
     @Override
     public void processFollowEvent(@Nonnull FollowEvent followEvent) {
@@ -365,14 +370,19 @@ public class ActivityPubManager implements ActivityListener, NotificationListene
             logger.warn("Context not found: {}", announce.getActor());
         });
     }
-    public User actorToUser(URI uri) throws HttpBadRequestException {
-        Actor person = (Actor) signatureManager.getContext(uri).orElseThrow(HttpBadRequestException::new);
-        User user = new User();
-        user.setUri(URI.create(person.getId()));
-        user.setName(person.getPreferredUsername());
-        if (person.getIcon() != null) {
-            user.setAvatar(person.getIcon().getUrl());
+    public User actorToUser(URI uri) throws HttpBadRequestException, JsonProcessingException {
+        var context = signatureManager.getContext(uri);
+        if (context.isPresent() && context.get() instanceof Actor actor) {
+            User user = new User();
+            user.setUri(URI.create(actor.getId()));
+            user.setName(actor.getPreferredUsername());
+            if (actor.getIcon() != null) {
+                user.setAvatar(actor.getIcon().getUrl());
+            }
+            return user;
+        } else {
+            logger.warn("Unhandled context: {}", jsonMapper.writeValueAsString(context));
+            throw new HttpBadRequestException();
         }
-        return user;
     }
 }