Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Refactor domain block checks (#11268)

Browse source
This commit is contained in:
Eugen Rochko 2019-07-09 03:27:35 +02:00 • committed by GitHub
parent 1e7187f2a8
commit 4e92183227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 108 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/services/activitypub/process_account_service.rb
View file

@ -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)