Skip to content
Snippets Groups Projects
Unverified Commit 9ac7e6fe authored by Claire's avatar Claire Committed by GitHub
Browse files

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
parent 0cae6c07
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment