diff options
author | ThibG <thib@sitedethib.com> | 2020-11-25 19:01:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-25 19:01:15 +0100 |
commit | 29812c2e59e02ea5ff8e4818a38b59944e2367ba (patch) | |
tree | 481dc4c0158a2def1e41f5998ef67a4e3707bb8b /app/services/delete_account_service.rb | |
parent | 24696458bf22c8529b49f89b2791e3e07583b7e0 (diff) | |
parent | b9fc807115e83347ad7bb74cd3ff82841c35809a (diff) |
Merge pull request #1468 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/delete_account_service.rb')
-rw-r--r-- | app/services/delete_account_service.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb index 778d064de..9cb80c95a 100644 --- a/app/services/delete_account_service.rb +++ b/app/services/delete_account_service.rb @@ -56,6 +56,7 @@ class DeleteAccountService < BaseService @options[:skip_activitypub] = true if @options[:skip_side_effects] reject_follows! + undo_follows! purge_user! purge_profile! purge_content! @@ -79,6 +80,20 @@ class DeleteAccountService < BaseService end end + def undo_follows! + return if @account.local? || !@account.activitypub? || @options[:skip_activitypub] + + # When deleting a remote account, the account obviously doesn't + # actually become deleted on its origin server, but following relationships + # are severed on our end. Therefore, make the remote server aware that the + # follow relationships are severed to avoid confusion and potential issues + # if the remote account gets un-suspended. + + ActivityPub::DeliveryWorker.push_bulk(Follow.where(target_account: @account)) do |follow| + [Oj.dump(serialize_payload(follow, ActivityPub::UndoFollowSerializer)), follow.account_id, @account.inbox_url] + end + end + def purge_user! return if !@account.local? || @account.user.nil? |