about summary refs log tree commit diff
path: root/app/services/unsuspend_account_service.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-08-20 08:40:33 +0200
committerGitHub <noreply@github.com>2021-08-20 07:40:33 +0100
commit9ac7e6fef770c0627c14d704fdf525c9515d6a6c (patch)
tree598d7109ea2495d04295016405f2361f925feba9 /app/services/unsuspend_account_service.rb
parent0cae6c07bb64b86bb1ac7188c11ddf182021aa5b (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/unsuspend_account_service.rb')
-rw-r--r--app/services/unsuspend_account_service.rb2
1 files changed, 1 insertions, 1 deletions
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!