ActivityPub: handle user deletion for suspended users

2 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/com/juick/www/api/activity/Profile.java b/src/main/java/com/juick/www/api/activity/Profile.java
index 724e0747f..cf5fb843e 100644
--- a/src/main/java/com/juick/www/api/activity/Profile.java
+++ b/src/main/java/com/juick/www/api/activity/Profile.java
@@ -376,7 +376,7 @@ public class Profile {
             if (activity instanceof Delete) {
                 // Delete gone user
                 // TODO: check if it is really deleted and remove copy-paste
-                if (activity.getActor().equals(activity.getObject().getUrl())) {
+                if (activity.getActor().equals(activity.getObject().getId())) {
                     return new ResponseEntity<>(CommandResult.fromString("Delete request accepted"),
                             HttpStatus.ACCEPTED);
                 }
diff --git a/src/main/java/com/juick/www/api/activity/model/objects/Actor.java b/src/main/java/com/juick/www/api/activity/model/objects/Actor.java
index f8bd63e01..7e799a953 100644
--- a/src/main/java/com/juick/www/api/activity/model/objects/Actor.java
+++ b/src/main/java/com/juick/www/api/activity/model/objects/Actor.java
@@ -23,6 +23,8 @@ import com.juick.www.api.activity.model.Context;
 public class Actor extends Context {
 
     private String preferredUsername;
+    private boolean suspended;
+
     private String inbox;
     private String outbox;
     private String following;
@@ -78,4 +80,12 @@ public class Actor extends Context {
     public void setPreferredUsername(String preferredUsername) {
         this.preferredUsername = preferredUsername;
     }
+
+    public boolean isSuspended() {
+        return suspended;
+    }
+
+    public void setSuspended(boolean suspended) {
+        this.suspended = suspended;
+    }
 }