tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change domain blocks to automatically support subdomains (#11138)

Browse Source 
* 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:
Eugen Rochko
2019-06-22 00:13:10 +02:00
committed by GitHub
parent 49ebda4d49
commit 707ddf7808
17 changed files with 89 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/instance.rb
View File

@ -8,7 +8,7 @@ class Instance
def initialize(resource)
@domain = resource.domain
@accounts_count = resource.is_a?(DomainBlock) ? nil : resource.accounts_count
@domain_block = resource.is_a?(DomainBlock) ? resource : DomainBlock.find_by(domain: domain)
@domain_block = resource.is_a?(DomainBlock) ? resource : DomainBlock.rule_for(domain)
end
def cached_sample_accounts