logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: ebc01bf0f61e58648ea7bfd4c915b4f373761e1d
parent: 85fce04d1b4353c3645c15967d222cdcdb488dfd
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun,  5 Mar 2017 23:03:49 +0100

Make the paperclip filename interpolator smarter about the :original style
If an :original gets converted into another format, it would get saved as
original_filename *anyway*, so generating the extension is pointless and
yields bad results for when you change the style definition later. This way,
old gifs will still have correct URLs

Diffstat:

Mconfig/initializers/paperclip.rb5+++++
1 file changed, 5 insertions(+), 0 deletions(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb @@ -2,6 +2,11 @@ Paperclip.options[:read_timeout] = 60 +Paperclip.interpolates :filename do |attachment, style| + return attachment.original_filename if style == :original + [basename(attachment, style), extension(attachment, style)].delete_if(&:empty?).join('.') +end + if ENV['S3_ENABLED'] == 'true' Aws.eager_autoload!(services: %w(S3))