Optional domain block attribute that prevents media attachments from being downloaded
This commit is contained in:
@ -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']
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user