|
@@ -24,28 +24,16 @@ module Remotable
|
|
|
Request.new(:get, url).perform do |response|
|
|
|
raise Mastodon::UnexpectedResponseError, response unless (200...300).cover?(response.code)
|
|
|
|
|
|
- content_type = parse_content_type(response.headers.get('content-type').last)
|
|
|
- extname = detect_extname_from_content_type(content_type)
|
|
|
-
|
|
|
- if extname.nil?
|
|
|
- disposition = response.headers.get('content-disposition').last
|
|
|
- matches = disposition&.match(/filename="([^"]*)"/)
|
|
|
- filename = matches.nil? ? parsed_url.path.split('/').last : matches[1]
|
|
|
- extname = filename.nil? ? '' : File.extname(filename)
|
|
|
- end
|
|
|
-
|
|
|
- basename = SecureRandom.hex(8)
|
|
|
-
|
|
|
- public_send("#{attachment_name}_file_name=", basename + extname)
|
|
|
- public_send("#{attachment_name}=", StringIO.new(response.body_with_limit(limit)))
|
|
|
+ public_send("#{attachment_name}=", ResponseWithLimit.new(response, limit))
|
|
|
end
|
|
|
rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError => e
|
|
|
Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
|
|
|
raise e unless suppress_errors
|
|
|
rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError => e
|
|
|
Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
|
|
|
- nil
|
|
|
end
|
|
|
+
|
|
|
+ nil
|
|
|
end
|
|
|
|
|
|
define_method("#{attribute_name}=") do |url|
|
|
@@ -59,26 +47,4 @@ module Remotable
|
|
|
alias_method("reset_#{attachment_name}!", "download_#{attachment_name}!")
|
|
|
end
|
|
|
end
|
|
|
-
|
|
|
- private
|
|
|
-
|
|
|
- def detect_extname_from_content_type(content_type)
|
|
|
- return if content_type.nil?
|
|
|
-
|
|
|
- type = MIME::Types[content_type].first
|
|
|
-
|
|
|
- return if type.nil?
|
|
|
-
|
|
|
- extname = type.extensions.first
|
|
|
-
|
|
|
- return if extname.nil?
|
|
|
-
|
|
|
- ".#{extname}"
|
|
|
- end
|
|
|
-
|
|
|
- def parse_content_type(content_type)
|
|
|
- return if content_type.nil?
|
|
|
-
|
|
|
- content_type.split(/\s*;\s*/).first
|
|
|
- end
|
|
|
end
|