Change domain blocks to automatically support subdomains (#11138)
* Change domain blocks to automatically support subdomains If a more authoritative domain is blocked (example.com), then the same block will be applied to a subdomain (foo.example.com) * Match subdomains of existing accounts when blocking/unblocking domains * Improve code style
This commit is contained in:
parent
49ebda4d49
commit
707ddf7808
17 changed files with 89 additions and 25 deletions
|
@ -14,7 +14,8 @@ class UnblockDomainService < BaseService
|
|||
end
|
||||
|
||||
def blocked_accounts
|
||||
scope = Account.where(domain: domain_block.domain)
|
||||
scope = Account.by_domain_and_subdomains(domain_block.domain)
|
||||
|
||||
if domain_block.silence?
|
||||
scope.where(silenced_at: @domain_block.created_at)
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue