diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-04 16:21:39 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-04 16:21:39 +0200 |
| commit | 6ab84c12a7ebc68fb8ce9a6b8228b28ec06a2c0f (patch) | |
| tree | 0f023e22bcb1ae01ce3fb4e43b771609493e4e65 /app/services/activitypub/process_account_service.rb | |
| parent | c94966891af1ff456c6382595c07c2d68c57ec49 (diff) | |
| parent | 99924f282f53593e670c70a38450a1c0e2d24c20 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 05c017bdf..3857e7c16 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -15,6 +15,8 @@ class ActivityPub::ProcessAccountService < BaseService @domain = domain @collections = {} + return if auto_suspend? + RedisLock.acquire(lock_options) do |lock| if lock.acquired? @account = Account.find_remote(@username, @domain) @@ -55,7 +57,7 @@ class ActivityPub::ProcessAccountService < BaseService @account.domain = @domain @account.private_key = nil @account.suspended_at = domain_block.created_at if auto_suspend? - @account.silenced_at = domain_block.created_at if auto_silence? + @account.silenced_at = domain_block.created_at if auto_silence? end def update_account |