From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 18 Jun 2018 15:27:05 +0000 (+0200)
Subject: Create special case to prefer "jpeg" over "jpe" file extension (#7841)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=50689f0d41b1f02c2d26c353571dfd15d8a4f186;p=mastodon.git

Create special case to prefer "jpeg" over "jpe" file extension (#7841)
---

diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 6f8489b89..db63c3eca 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -41,7 +41,9 @@ module Attachmentable
 
     extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions
     original_extension       = Paperclip::Interpolations.extension(attachment, :original)
+    proper_extension         = extensions_for_mime_type.first.to_s
+    proper_extension         = 'jpeg' if proper_extension == 'jpe'
 
-    extensions_for_mime_type.include?(original_extension) ? original_extension : extensions_for_mime_type.first
+    extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
   end
 end