Fix sending spurious Rejects when processing remote account deletion (#15104)

* Fix sending spurious Rejects when processing remote account deletion * Make skip_side_effects imply skip_activitypub
2020-11-19 17:39:47 +01:00
parent df1653174b
commit 2f6831f318
4 changed files with 8 additions and 4 deletions
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@ -13,7 +13,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity

  def delete_person
    lock_or_return("delete_in_progress:#{@account.id}") do
-      DeleteAccountService.new.call(@account, reserve_username: false)
+      DeleteAccountService.new.call(@account, reserve_username: false, skip_activitypub: true)
    end
  end