From 434cf8237e7960305b95199b2f0fab75d4da2e60 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 23 Jan 2017 21:36:08 +0100 Subject: Optional domain block attribute that prevents media attachments from being downloaded --- app/services/process_feed_service.rb | 2 ++ app/services/process_hashtags_service.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index fad03e580..84273680d 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -180,6 +180,8 @@ class ProcessFeedService < BaseService end def media_from_xml(parent, xml) + return if 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'] diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb index 8d7fbe92b..617a38159 100644 --- a/app/services/process_hashtags_service.rb +++ b/app/services/process_hashtags_service.rb @@ -4,7 +4,7 @@ class ProcessHashtagsService < BaseService def call(status, tags = []) tags = status.text.scan(Tag::HASHTAG_RE).map(&:first) if status.local? - tags.map { |str| str.mb_chars.downcase }.uniq{ |t| t.to_s }.each do |tag| + tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |tag| status.tags << Tag.where(name: tag).first_or_initialize(name: tag) end -- cgit