diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-16 12:51:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-16 12:51:30 +0200 |
commit | 5d710b1139b34f2ed6bd556f448fa7248354e758 (patch) | |
tree | 958a5ff315699f13b4668f190c321291df06e29c /app/services/process_feed_service.rb | |
parent | 8a58942c80275788cbe069f2d67c396732ec092d (diff) |
Make file attachment on MediaAttachment optional (#1865)
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI
Diffstat (limited to 'app/services/process_feed_service.rb')
-rw-r--r-- | app/services/process_feed_service.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 321f53f22..fa0633b27 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -179,12 +179,12 @@ class ProcessFeedService < BaseService end def hashtags_from_xml(parent, xml) - tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select { |t| !t.blank? } + tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?) ProcessHashtagsService.new.call(parent, tags) end def media_from_xml(parent, xml) - return if DomainBlock.find_by(domain: parent.account.domain)&.reject_media? + do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media? xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link| next unless link['href'] @@ -192,7 +192,11 @@ class ProcessFeedService < BaseService media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href']) parsed_url = URI.parse(link['href']) - next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? + next if !%w[http https].include?(parsed_url.scheme) || parsed_url.host.empty? + + media.save + + next if do_not_download begin media.file_remote_url = link['href'] |