From 9ac7e6fef770c0627c14d704fdf525c9515d6a6c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 20 Aug 2021 08:40:33 +0200
Subject: [PATCH] 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
---
app/services/resolve_account_service.rb | 1 +
app/services/unsuspend_account_service.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index 5400612bfd..b266c019e2 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 b383f126a7..39d8a6ba7f 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!