Corrected flow for federated user deletion

1 files changed, 10 insertions, 7 deletions

diff --git a/src/main/java/com/juick/server/api/activity/Profile.java b/src/main/java/com/juick/server/api/activity/Profile.java
index 84a3de33..b1d325f9 100644
--- a/src/main/java/com/juick/server/api/activity/Profile.java
+++ b/src/main/java/com/juick/server/api/activity/Profile.java
@@ -284,13 +284,6 @@ public class Profile {
                     return new ResponseEntity<>(HttpStatus.OK);
                 }
             }
-            if (activity instanceof Delete) {
-                if (activity.getObject() instanceof String) {
-                    // Delete user
-                    applicationEventPublisher.publishEvent(new DeleteUserEvent(this, (String)activity.getObject()));
-                    return new ResponseEntity<>(HttpStatus.OK);
-                }
-            }
             if (activity instanceof Create) {
                 if (activity.getObject() instanceof Map) {
                     Map<String, Object> note = (Map<String, Object>) activity.getObject();
@@ -361,6 +354,16 @@ public class Profile {
             logger.warn("Unknown activity: {}", jsonMapper.writeValueAsString(activity));
             return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
         }
+        if (activity instanceof Delete) {
+            if (activity.getObject() instanceof String) {
+                // Delete gone user
+                if (activity.getActor().equals(activity.getObject())) {
+                    if (signatureManager.getContext(URI.create(activity.getActor())).isEmpty()) {
+                        return new ResponseEntity<>(HttpStatus.ACCEPTED);
+                    }
+                }
+            }
+        }
         return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
     }
     @PostMapping(value = "/u/", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)