fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-19 16:07:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* Fix remotely-suspended accounts' toots being merged back into timelines

* Mark remotely-deleted accounts as remotely suspended
This commit is contained in:
Claire 2021-08-20 08:40:33 +02:00 committed by GitHub
parent 0cae6c07bb
commit 9ac7e6fef7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/services/resolve_account_service.rb
View file

@ -142,6 +142,7 @@ class ResolveAccountService < BaseService
end end
def queue_deletion! def queue_deletion!
@account.suspend!(origin: :remote)
AccountDeletionWorker.perform_async(@account.id, reserve_username: false, skip_activitypub: true) AccountDeletionWorker.perform_async(@account.id, reserve_username: false, skip_activitypub: true)
end end

2
app/services/unsuspend_account_service.rb
View file

@ -8,7 +8,7 @@ class UnsuspendAccountService < BaseService
unsuspend! unsuspend!
refresh_remote_account! refresh_remote_account!
return if @account.nil? return if @account.nil? || @account.suspended?
merge_into_home_timelines! merge_into_home_timelines!
merge_into_list_timelines! merge_into_list_timelines!