From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 30 Jun 2019 14:10:43 +0000 (+0200)
Subject: Fix support for MP4 files that are actually M4V files (#11210)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=06424786a140e03fcb899232c3c418b7eaf26d5e;p=mastodon.git

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

Resolve #11187
---

diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 24f5968de..7c78bb456 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -60,7 +60,9 @@ module Attachmentable
   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