diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-19 15:17:14 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-19 15:17:14 +0000 |
commit | 1445ba17033cdfdd21d0999f65267754af6344af (patch) | |
tree | 4919ecd746c8dec4be33af47d83f11cec098cf69 /app/models/concerns/account_header.rb | |
parent | 3d033a468748338b6036cb24bb00ea4e88656ae6 (diff) | |
parent | 66105929e07fc7ddbdb8b66696b9ce1ed5d25957 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/concerns/account_header.rb')
-rw-r--r-- | app/models/concerns/account_header.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb index aff2aa3f9..991473d8c 100644 --- a/app/models/concerns/account_header.rb +++ b/app/models/concerns/account_header.rb @@ -7,9 +7,15 @@ module AccountHeader class_methods do def header_styles(file) - styles = { original: '700x335#' } - styles[:static] = { format: 'png', convert_options: '-coalesce' } if file.content_type == 'image/gif' + styles = {} + geometry = Paperclip::Geometry.from_file(file) + + styles[:original] = '700x335#' unless geometry.width == 700 && geometry.height == 335 + styles[:static] = { format: 'png', convert_options: '-coalesce' } if file.content_type == 'image/gif' + styles + rescue Paperclip::Errors::NotIdentifiedByImageMagickError + {} end private :header_styles @@ -17,7 +23,7 @@ module AccountHeader included do # Header upload - has_attached_file :header, styles: ->(f) { header_styles(f) }, convert_options: { all: '-quality 80 -strip' } + has_attached_file :header, styles: ->(f) { header_styles(f) }, convert_options: { all: '-strip' } validates_attachment_content_type :header, content_type: IMAGE_MIME_TYPES validates_attachment_size :header, less_than: 2.megabytes end |