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/services/activitypub/process_account_service.rb
View File

@ -205,7 +205,7 @@ class ActivityPub::ProcessAccountService < BaseService
def domain_block
return @domain_block if defined?(@domain_block)
@domain_block = DomainBlock.find_by(domain: @domain)
@domain_block = DomainBlock.rule_for(@domain)
end
def key_changed?