diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-01 19:13:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-01 19:13:30 +0200 |
commit | 2cfa427ea7c08abc3fa52fb2e8bfd569146e9c98 (patch) | |
tree | 0c3a41ba7470478048d59a828a23866e0645318a /app/services/activitypub | |
parent | 13f54f41ade5abfa561c72264481afed5f1cd8a7 (diff) |
Change domain block behaviour to prevent creation of accounts from suspended domains (#11219)
Diffstat (limited to 'app/services/activitypub')
-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 |