diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-08-20 08:40:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 07:40:33 +0100 |
| commit | 9ac7e6fef770c0627c14d704fdf525c9515d6a6c (patch) | |
| tree | 598d7109ea2495d04295016405f2361f925feba9 /app/services | |
| parent | 0cae6c07bb64b86bb1ac7188c11ddf182021aa5b (diff) | |
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
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/resolve_account_service.rb | 1 | ||||
| -rw-r--r-- | app/services/unsuspend_account_service.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb index 5400612bf..b266c019e 100644 --- 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 diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb index b383f126a..39d8a6ba7 100644 --- 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! |