diff options
| -rw-r--r-- | app/models/account.rb | 1 | ||||
| -rw-r--r-- | app/models/concerns/account_avatar.rb | 11 | ||||
| -rw-r--r-- | app/models/concerns/account_header.rb | 11 | ||||
| -rw-r--r-- | app/models/concerns/remotable.rb | 35 | ||||
| -rw-r--r-- | app/models/media_attachment.rb | 7 | ||||
| -rw-r--r-- | app/models/preview_card.rb | 1 | ||||
| -rw-r--r-- | app/services/fetch_link_card_service.rb | 8 | ||||
| -rw-r--r-- | app/services/process_feed_service.rb | 4 |
8 files changed, 46 insertions, 32 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index bd47ce8a9..03e7db398 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -44,6 +44,7 @@ class Account < ApplicationRecord include AccountAvatar include AccountHeader include Attachmentable + include Remotable include Targetable # Local users diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb index 8b9b72659..c664366ef 100644 --- a/app/models/concerns/account_avatar.rb +++ b/app/models/concerns/account_avatar.rb @@ -26,16 +26,5 @@ module AccountAvatar def avatar_static_url avatar_content_type == 'image/gif' ? avatar.url(:static) : avatar_original_url end - - def avatar_remote_url=(url) - parsed_url = Addressable::URI.parse(url).normalize - - return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[:avatar_remote_url] == url - - self.avatar = URI.parse(parsed_url.to_s) - self[:avatar_remote_url] = url - rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e - Rails.logger.debug "Error fetching remote avatar: #{e}" - end end end diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb index 42f556a46..f1b0883ee 100644 --- a/app/models/concerns/account_header.rb +++ b/app/models/concerns/account_header.rb @@ -26,16 +26,5 @@ module AccountHeader def header_static_url header_content_type == 'image/gif' ? header.url(:static) : header_original_url end - - def header_remote_url=(url) - parsed_url = Addressable::URI.parse(url).normalize - - return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[:header_remote_url] == url - - self.header = URI.parse(parsed_url.to_s) - self[:header_remote_url] = url - rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e - Rails.logger.debug "Error fetching remote header: #{e}" - end end end diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb new file mode 100644 index 000000000..4a412ee3d --- /dev/null +++ b/app/models/concerns/remotable.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +module Remotable + include HttpHelper + extend ActiveSupport::Concern + + included do + attachment_definitions.each_key do |attachment_name| + attribute_name = "#{attachment_name}_remote_url".to_sym + method_name = "#{attribute_name}=".to_sym + + define_method method_name do |url| + parsed_url = Addressable::URI.parse(url).normalize + + return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[attribute_name] == url + + begin + response = http_client.get(url) + + return if response.code != 200 + + matches = response.headers['content-disposition']&.match(/filename="([^"]*)"/) + filename = matches.nil? ? parsed_url.path.split('/').last : matches[1] + + send("#{attachment_name}=", StringIO.new(response.to_s)) + send("#{attachment_name}_file_name=", filename) + + self[attribute_name] = url if has_attribute?(attribute_name) + rescue HTTP::TimeoutError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e + Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}" + end + end + end + end +end diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 3277eb227..c29a66eb2 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -46,6 +46,9 @@ class MediaAttachment < ApplicationRecord styles: ->(f) { file_styles f }, processors: ->(f) { file_processors f }, convert_options: { all: '-quality 90 -strip' } + + include Remotable + validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES validates_attachment_size :file, less_than: 8.megabytes @@ -59,10 +62,6 @@ class MediaAttachment < ApplicationRecord remote_url.blank? end - def file_remote_url=(url) - self.file = URI.parse(Addressable::URI.parse(url).normalize.to_s) - end - def to_param shortcode end diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index a57f1252c..c334c48aa 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -36,6 +36,7 @@ class PreviewCard < ApplicationRecord has_attached_file :image, styles: { original: '120x120#' }, convert_options: { all: '-quality 80 -strip' } include Attachmentable + include Remotable validates :url, presence: true validates_attachment_content_type :image, content_type: IMAGE_MIME_TYPES diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index dec4aabd6..ec9b5226e 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -84,10 +84,10 @@ class FetchLinkCardService < BaseService page = Nokogiri::HTML(response.to_s) - card.type = :link - card.title = meta_property(page, 'og:title') || page.at_xpath('//title')&.content - card.description = meta_property(page, 'og:description') || meta_property(page, 'description') - card.image = URI.parse(Addressable::URI.parse(meta_property(page, 'og:image')).normalize.to_s) if meta_property(page, 'og:image') + card.type = :link + card.title = meta_property(page, 'og:title') || page.at_xpath('//title')&.content + card.description = meta_property(page, 'og:description') || meta_property(page, 'description') + card.image_remote_url = meta_property(page, 'og:image') if meta_property(page, 'og:image') return if card.title.blank? diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 04d6a100f..28ace7ae9 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -239,8 +239,8 @@ class ProcessFeedService < BaseService begin media.file_remote_url = link['href'] - media.save - rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError + media.save! + rescue ActiveRecord::RecordInvalid next end end |