diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-18 03:02:30 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 03:47:08 -0600 |
| commit | fb8ed9ae30a9b7e76d4f42d1d4ce2d435e9c8ca2 (patch) | |
| tree | 76b114997225c8cb113caaff18a17dd9ec7d7939 | |
| parent | 698684843748b9b847b8a6cf8cd2a30e3b507884 (diff) | |
port tootsuite#11342 to monsterfork: Add aac, m4a, 3gp to allowed audio formats
Fix #11186
| -rw-r--r-- | app/models/media_attachment.rb | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 4e57571d8..8726f1388 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -26,19 +26,14 @@ class MediaAttachment < ApplicationRecord enum type: [:image, :gifv, :video, :unknown, :audio] - IMAGE_FILE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif'].freeze - VIDEO_FILE_EXTENSIONS = ['.webm', '.mp4', '.m4v', '.mov'].freeze - AUDIO_FILE_EXTENSIONS = ['.ogg', '.oga', '.mp3', '.wav', '.flac', '.opus'].freeze - -<<<<<<< HEAD - IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze - VIDEO_MIME_TYPES = ['video/webm', 'video/mp4', 'video/quicktime'].freeze -======= - IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze - VIDEO_MIME_TYPES = ['video/webm', 'video/mp4', 'video/quicktime', 'video/ogg'].freeze ->>>>>>> b927bb3f0... Fix audio-only OGG and WebM files not being processed as such (#11151) - VIDEO_CONVERTIBLE_MIME_TYPES = ['video/webm', 'video/quicktime'].freeze - AUDIO_MIME_TYPES = ['audio/wave', 'audio/wav', 'audio/x-wav', 'audio/x-pn-wave', 'audio/ogg', 'audio/mpeg', 'audio/mp3', 'audio/webm', 'audio/flac'].freeze + IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif).freeze + VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze + AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp).freeze + + IMAGE_MIME_TYPES = %w(image/jpeg image/png image/gif).freeze + VIDEO_MIME_TYPES = %w(video/webm video/mp4 video/quicktime video/ogg).freeze + VIDEO_CONVERTIBLE_MIME_TYPES = %w(video/webm video/quicktime).freeze + AUDIO_MIME_TYPES = %w(audio/wave audio/wav audio/x-wav audio/x-pn-wave audio/ogg audio/mpeg audio/mp3 audio/webm audio/flac audio/aac audio/m4a audio/3gpp).freeze BLURHASH_OPTIONS = { x_comp: 4, |