diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-22 00:13:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 00:13:10 +0200 |
| commit | 707ddf7808f90e3ab042d7642d368c2ce8e95e6f (patch) | |
| tree | 2fdc55f43eff9ea113a989520f72020ccdaa6649 /app/services/unblock_domain_service.rb | |
| parent | 49ebda4d49af50b375126e4a8285686fb6448a60 (diff) | |
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
Diffstat (limited to 'app/services/unblock_domain_service.rb')
| -rw-r--r-- | app/services/unblock_domain_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb index 9b8526fbe..fc262a50a 100644 --- a/app/services/unblock_domain_service.rb +++ b/app/services/unblock_domain_service.rb @@ -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 |