Unfloyded/Legamunt
0
0
Fork 0
Code 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 89 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/ostatus/activity/creation.rb
View file

@ -148,7 +148,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
end
def save_media
do_not_download = DomainBlock.find_by(domain: @account.domain)&.reject_media?
do_not_download = DomainBlock.reject_media?(@account.domain)
media_attachments = []
@xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: OStatus::TagManager::XMLNS).each do |link|
@ -176,7 +176,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
end
def save_emojis(parent)
do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
do_not_download = DomainBlock.reject_media?(parent.account.domain)
return if do_not_download