diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-09-02 02:02:39 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-09-02 02:02:39 -0500 |
| commit | b0c4ca2f767861ee00b6622778733bae0a885db5 (patch) | |
| tree | d334819708ec8d95064d0a03f56f9c82b8a49a22 /app | |
| parent | ab9a3c2fe28a92dfa7331829a44b81c3d5bdb1f5 (diff) | |
use same matching rules for `skip_download?` as `MediaAttachment.instance.blocked?`
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index b9c6d1c45..e7fe19152 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -259,7 +259,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end def process_emoji(tag) - return if @options[:imported] || skip_download? + return if @options[:imported] || skip_download?(tag['icon']['url']) return if tag['name'].blank? || tag['icon'].blank? || tag['icon']['url'].blank? shortcode = tag['name'].delete(':') @@ -287,7 +287,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['name'].presence, focus: attachment['focalPoint'], blurhash: supported_blurhash?(attachment['blurhash']) ? attachment['blurhash'] : nil) media_attachments << media_attachment - next if unsupported_media_type?(attachment['mediaType']) || skip_download? + next if unsupported_media_type?(attachment['mediaType']) || skip_download?(href) media_attachment.file_remote_url = href media_attachment.save @@ -464,9 +464,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity components.present? && components.none? { |comp| comp > 5 } end - def skip_download? + def skip_download?(remote_url = nil) return @skip_download if defined?(@skip_download) - @skip_download ||= DomainBlock.find_by(domain: @account.domain)&.reject_media? + domains = Set[@account.domain] + domains.add(remote_url.scan(/[\w\-]+\.[\w\-]+(?:\.[\w\-]+)*/).first) if remote_url.present? + blocks = DomainBlock.suspend.or(DomainBlock.where(reject_media: true)) + @skip_download ||= domains.any? { |domain| blocks.where(domain: domain).or(blocks.where('domain LIKE ?', "%.#{domain}")).exists? } end def reply_to_local? |