Browse Source

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
closed-social-v3
Claire 3 years ago
committed by Eugen Rochko
parent
commit
f51c6cba1f
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      app/services/resolve_account_service.rb
  2. +1
    -1
      app/services/unsuspend_account_service.rb

+ 1
- 0
app/services/resolve_account_service.rb View File

@ -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

+ 1
- 1
app/services/unsuspend_account_service.rb View File

@ -7,7 +7,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!

Loading…
Cancel
Save