From bfe26ef67b6ee2ce4a4ca05565cd383074de3a8b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 21 Apr 2018 21:34:36 +0200
Subject: [PATCH] Force convert to JPG for preview card thumbnails to avoid
animations (#7109)
* Force convert to JPG for preview card thumbnails to avoid animations
Fix #7093
* Conditionally convert to JPG only if original is GIF
Coalesce and strip on all formats to ensure no animated APNGs
---
app/models/preview_card.rb | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 0c82f06ce0..0ffa6b10fd 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -34,7 +34,7 @@ class PreviewCard < ApplicationRecord
has_and_belongs_to_many :statuses
- has_attached_file :image, styles: { original: { geometry: '400x400>', file_geometry_parser: FastGeometryParser } }, convert_options: { all: '-quality 80 -strip' }
+ has_attached_file :image, styles: ->(f) { image_styles(f) }, convert_options: { all: '-quality 80 -strip' }
include Attachmentable
@@ -52,6 +52,23 @@ class PreviewCard < ApplicationRecord
save!
end
+ class << self
+ private
+
+ def image_styles(f)
+ styles = {
+ original: {
+ geometry: '400x400>',
+ file_geometry_parser: FastGeometryParser,
+ convert_options: '-coalesce -strip',
+ },
+ }
+
+ styles[:original][:format] = 'jpg' if f.instance.image_content_type == 'image/gif'
+ styles
+ end
+ end
+
private
def extract_dimensions
--
GitLab