Merge branch 'develop' into staging

mstdn-plusminus-io · Dec 26, 2023 · 2569c37 · 2569c37
2 parents c586591 + 8aace1f
commit 2569c37
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
@@ -323,7 +323,9 @@ def file_processors(instance)
   def set_unknown_type
     if file.blank? && !type_changed?
       if ENV['DISABLE_REMOTE_MEDIA_CACHE'] == 'true'
-        mime = MimeMagic.by_path(File.basename(remote_url)).type
+        mime = MimeMagic.by_path(File.basename(remote_url))
+        return self.type = :unknown if mime.nil?
+
         self.type = begin
           if VIDEO_MIME_TYPES.include?(mime)
             :video