diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-09 03:27:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-09 03:27:35 +0200 |
commit | 4e921832272425352d28cad550bfc4dffd6d0e78 (patch) | |
tree | c315a0b9dda8b69b6512c79711e896a18756f701 /app/services/activitypub/process_account_service.rb | |
parent | 1e7187f2a8e0b9ffe4e7d6b06e9f70674c50471e (diff) |
Refactor domain block checks (#11268)
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 3857e7c16..603e27ed9 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -2,11 +2,12 @@ class ActivityPub::ProcessAccountService < BaseService include JsonLdHelper + include DomainControlHelper # Should be called with confirmed valid JSON # and WebFinger-resolved username and domain def call(username, domain, json, options = {}) - return if json['inbox'].blank? || unsupported_uri_scheme?(json['id']) + return if json['inbox'].blank? || unsupported_uri_scheme?(json['id']) || domain_not_allowed?(domain) @options = options @json = json @@ -15,8 +16,6 @@ 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) |