diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 18:44:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 18:44:15 +0100 |
| commit | ad17e1944aa4c01c5637199b464c9d78b7e54af2 (patch) | |
| tree | dee9d23334a0d23fbc3737e3c17033727805a141 /app/services/suspend_account_service.rb | |
| parent | 7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff) | |
| parent | c4649ae9d4ef34cc0bad9d5df0da8e8b6c729522 (diff) | |
Merge pull request #2071 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/suspend_account_service.rb')
| -rw-r--r-- | app/services/suspend_account_service.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 6856c2c51..211544fea 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -3,10 +3,13 @@ class SuspendAccountService < BaseService include Payloadable + # Carry out the suspension of a recently-suspended account + # @param [Account] account Account to suspend def call(account) + return unless account.suspended? + @account = account - suspend! reject_remote_follows! distribute_update_actor! unmerge_from_home_timelines! @@ -16,10 +19,6 @@ class SuspendAccountService < BaseService private - def suspend! - @account.suspend! unless @account.suspended? - end - def reject_remote_follows! return if @account.local? || !@account.activitypub? |