Fixes unknown mime type (mastodon#2822)

pixiv · May 8, 2017 · e9ec6d6 · e9ec6d6
1 parent 43740e2
commit e9ec6d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
@@ -110,7 +110,7 @@ def set_type_and_extension
     self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
     extension = appropriate_extension
     basename  = Paperclip::Interpolations.basename(file, :original)
-    file.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')
+    file.instance_write :file_name, [basename, extension].delete_if(&:blank?).join('.')
   end
 
   def set_meta

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
@@ -12,7 +12,7 @@
   # extname = extension(attachment, style).to_s
   extname = content_type_extension(attachment, style) # if extname.blank? || wrong_extnames.include?(extname)
 
-  [basename(attachment, style), extname].delete_if(&:empty?).join('.')
+  [basename(attachment, style), extname].delete_if(&:blank?).join('.')
 end
 
 if ENV['S3_ENABLED'] == 'true'