diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-22 02:50:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-22 02:50:36 +0200 |
commit | aa9b37822bd39dff771844b7b1ac149e37788d34 (patch) | |
tree | 3be8da439c83958dc5076548c6042ffeff66d461 | |
parent | 84f945d64c00c73c35a3f9c23b895a4288ff2592 (diff) |
Fix audio not being downloaded from remote servers (#11145)
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 | ||||
-rw-r--r-- | app/models/media_attachment.rb | 8 | ||||
-rw-r--r-- | app/serializers/initial_state_serializer.rb | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 487e8e91e..00f0dd42d 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -370,7 +370,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end def unsupported_media_type?(mime_type) - mime_type.present? && !(MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES).include?(mime_type) + mime_type.present? && !MediaAttachment.supported_mime_types.include?(mime_type) end def supported_blurhash?(blurhash) diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 4c55d4b98..a9b6d96c6 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -177,6 +177,14 @@ class MediaAttachment < ApplicationRecord before_save :set_meta class << self + def supported_mime_types + 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(f) diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 3d825410e..8daf36e0a 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -60,7 +60,7 @@ class InitialStateSerializer < ActiveModel::Serializer end def media_attachments - { accept_content_types: MediaAttachment::IMAGE_FILE_EXTENSIONS + MediaAttachment::VIDEO_FILE_EXTENSIONS + MediaAttachment::AUDIO_FILE_EXTENSIONS + MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES } + { accept_content_types: MediaAttachment.supported_file_extensions + MediaAttachment.supported_mime_types } end private |