From 2dacf79bcc58094b58f1689189ce130fb34b2c8f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 20 Jun 2019 10:52:36 +0200
Subject: port tootsuite#11130 to monsterfork: Fix converted media being saved
 with original extension and mime type

---
 app/models/concerns/attachmentable.rb | 2 +-
 app/models/media_attachment.rb        | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index dd11e0814..08af107c7 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'mime/types'
+require 'mime/types/columnar'
 
 module Attachmentable
   extend ActiveSupport::Concern
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 3ef163f46..ce3549539 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -87,12 +87,14 @@ class MediaAttachment < ApplicationRecord
   AUDIO_STYLES = {
     original: {
       format: 'ogg',
+      content_type: 'audio/ogg',
       convert_options: {},
     },
   }.freeze
 
   VIDEO_FORMAT = {
     format: 'mp4',
+    content_type: 'video/mp4',
     convert_options: {
       output: {
         'loglevel' => 'fatal',
@@ -228,11 +230,11 @@ class MediaAttachment < ApplicationRecord
       if f.file_content_type == 'image/gif'
         [:gif_transcoder, :blurhash_transcoder]
       elsif VIDEO_MIME_TYPES.include?(f.file_content_type)
-        [:video_transcoder, :blurhash_transcoder]
+        [:video_transcoder, :blurhash_transcoder, :type_corrector]
       elsif AUDIO_MIME_TYPES.include?(f.file_content_type)
-        [:transcoder]
+        [:transcoder, :type_corrector]
       else
-        [:lazy_thumbnail, :blurhash_transcoder]
+        [:lazy_thumbnail, :blurhash_transcoder, :type_corrector]
       end
     end
   end
-- 
cgit