Fix remotely-suspended accounts' toots being merged back into timelines (#16628)

* Fix remotely-suspended accounts' toots being merged back into timelines * Mark remotely-deleted accounts as remotely suspended
3 years ago · 9ac7e6fef7
parent 0cae6c07bb
commit 9ac7e6fef7
2 changed files with 2 additions and 1 deletions
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@ -142,6 +142,7 @@ class ResolveAccountService < BaseService
  end

  def queue_deletion!
+    @account.suspend!(origin: :remote)
    AccountDeletionWorker.perform_async(@account.id, reserve_username: false, skip_activitypub: true)
  end

--- a/app/services/unsuspend_account_service.rb
+++ b/app/services/unsuspend_account_service.rb
@ -8,7 +8,7 @@ class UnsuspendAccountService < BaseService
    unsuspend!
    refresh_remote_account!

-    return if @account.nil?
+    return if @account.nil? || @account.suspended?

    merge_into_home_timelines!
    merge_into_list_timelines!