From d918967281652ead0130c5dbef663e82003d4393 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 22 Aug 2021 10:57:02 +0300
Subject: ActivityPub: handle user deletion for suspended users

---
 src/main/java/com/juick/www/api/activity/Profile.java          |  2 +-
 .../java/com/juick/www/api/activity/model/objects/Actor.java   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/juick/www/api/activity')

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 724e0747..cf5fb843 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 f8bd63e0..7e799a95 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;
+    }
 }
-- 
cgit v1.2.3