Fix support for MP4 files that are actually M4V files (mastodon#11210)

Resolve mastodon#11187
ProjectMyosotis · Oct 2, 2019 · 0b65816 · 0b65816
1 parent 537938e
commit 0b65816
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
@@ -60,7 +60,9 @@ def appropriate_extension(attachment)
   end
 
   def calculated_content_type(attachment)
-    Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp
+    content_type = Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp
+    content_type = 'video/mp4' if content_type == 'video/x-m4v'
+    content_type
   rescue Terrapin::CommandLineError
     ''
   end