Optional domain block attribute that prevents media attachments from being downloaded

This commit is contained in:
Eugen Rochko
2017-01-23 21:36:08 +01:00
parent cca82bf0a2
commit 434cf8237e
4 changed files with 14 additions and 6 deletions

View File

@ -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']

View File

@ -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