From e482595a5dfd69efacffeddbd48f48c5b92deaea Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 1 Sep 2017 21:54:42 +0200
Subject: Add ActivityPub handler for Delete->Actor activities (#4761)

---
 app/lib/activitypub/activity/delete.rb | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 767909fb1..9d804c86d 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -2,6 +2,20 @@
 
 class ActivityPub::Activity::Delete < ActivityPub::Activity
   def perform
+    if @account.uri == object_uri
+      delete_person
+    else
+      delete_note
+    end
+  end
+
+  private
+
+  def delete_person
+    SuspendAccountService.new.call(@account)
+  end
+
+  def delete_note
     status   = Status.find_by(uri: object_uri, account: @account)
     status ||= Status.find_by(uri: @object['_:atomUri'], account: @account) if @object.is_a?(Hash) && @object['_:atomUri'].present?
 
@@ -13,8 +27,6 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
     delete_now!(status)
   end
 
-  private
-
   def forward_for_reblogs(status)
     return if @json['signature'].blank?
 
-- 
cgit