Fix ogg vorbis files with a cover art not being correctly processed (m…

…astodon#14255)

lib/paperclip/media_type_spoof_detector_extensions.rb

@@ -2,8 +2,16 @@
 
 module Paperclip
  module MediaTypeSpoofDetectorExtensions
- def calculated_content_type
- @calculated_content_type ||= type_from_mime_magic || type_from_file_command
+ def mapping_override_mismatch?
+ !Array(mapped_content_type).include?(calculated_content_type) && !Array(mapped_content_type).include?(type_from_mime_magic)
+ end
+
+ def calculated_media_type_from_mime_magic
+ @calculated_media_type_from_mime_magic ||= type_from_mime_magic.split('/').first
+ end
+
+ def calculated_type_mismatch?
+ !media_types_from_name.include?(calculated_media_type) && !media_types_from_name.include?(calculated_media_type_from_mime_magic)
  end
 
  def type_from_mime_magic