Merge branch 'main' into glitch-soc/merge-upstream

2021-08-20 13:01:50 +02:00
parent 4a364de500 a2afcac7d9
commit 4e2a8c9b38
16 changed files with 412 additions and 220 deletions
--- 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

--- a/app/services/unsuspend_account_service.rb
+++ b/app/services/unsuspend_account_service.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true

 class UnsuspendAccountService < BaseService
+  include Payloadable
  def call(account)
    @account = account

    unsuspend!
    refresh_remote_account!

-    return if @account.nil?
+    return if @account.nil? || @account.suspended?

    merge_into_home_timelines!
    merge_into_list_timelines!