diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-28 21:48:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 21:48:28 -0400 |
| commit | c027a7bd4d7b5af21f4b201d656f7251fa3606a1 (patch) | |
| tree | ce2c2327b26358c26cb899ea918988af373ca6d6 /app/models/concerns/remotable.rb | |
| parent | 210e6776fce016666ecfd248b2208c487f3440f9 (diff) | |
| parent | 53f829dfa8bc376041a442dc84c22aa1cbfcb9d0 (diff) | |
Merge pull request #157 from glitch-soc/merging-upstream
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
Diffstat (limited to 'app/models/concerns/remotable.rb')
| -rw-r--r-- | app/models/concerns/remotable.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb index 270043a9e..990035b34 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -27,9 +27,11 @@ module Remotable matches = response.headers['content-disposition']&.match(/filename="([^"]*)"/) filename = matches.nil? ? parsed_url.path.split('/').last : matches[1] + basename = SecureRandom.hex(8) + extname = File.extname(filename) send("#{attachment_name}=", StringIO.new(response.to_s)) - send("#{attachment_name}_file_name=", filename) + send("#{attachment_name}_file_name=", basename + extname) self[attribute_name] = url if has_attribute?(attribute_name) rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError => e |