Merge b3ba07e6fa into c442589593

app/models/concerns/media_attachment/extensions.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module MediaAttachment::Extensions
+  extend ActiveSupport::Concern
+
+  AUDIO_FILE_EXTENSIONS = %w(
+    .3gp
+    .aac
+    .flac
+    .m4a
+    .mp3
+    .oga
+    .ogg
+    .opus
+    .wav
+    .wma
+  ).freeze
+
+  IMAGE_FILE_EXTENSIONS = %w(
+    .avif
+    .gif
+    .heic
+    .heif
+    .jpeg
+    .jpg
+    .png
+    .webp
+  ).freeze
+
+  VIDEO_FILE_EXTENSIONS = %w(
+    .m4v
+    .mov
+    .mp4
+    .webm
+  ).freeze
+
+  class_methods do
+    def supported_file_extensions
+      [
+        AUDIO_FILE_EXTENSIONS,
+        IMAGE_FILE_EXTENSIONS,
+        VIDEO_FILE_EXTENSIONS,
+      ]
+        .flatten
+        .sort
+    end
+  end
+end

app/models/media_attachment.rb

@@ -33,6 +33,7 @@ class MediaAttachment < ApplicationRecord
   self.inheritance_column = nil
 
   include Attachmentable
+  include MediaAttachment::Extensions
 
   enum :type, { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
   enum :processing, { queued: 0, in_progress: 1, complete: 2, failed: 3 }, prefix: true
@@ -46,10 +47,6 @@ class MediaAttachment < ApplicationRecord
   MAX_VIDEO_FRAME_RATE   = 120
   MAX_VIDEO_FRAMES       = 36_000 # Approx. 5 minutes at 120 fps
 
-  IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif .webp .heic .heif .avif).freeze
-  VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze
-  AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp .wma).freeze
-
   META_KEYS = %i(
     focus
     colors
@@ -294,10 +291,6 @@ class MediaAttachment < ApplicationRecord
       IMAGE_MIME_TYPES + VIDEO_MIME_TYPES + AUDIO_MIME_TYPES
     end
 
-    def supported_file_extensions
-      IMAGE_FILE_EXTENSIONS + VIDEO_FILE_EXTENSIONS + AUDIO_FILE_EXTENSIONS
-    end
-
     private
 
     def file_styles(attachment)