diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 14:47:48 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 15:02:59 +0200 |
| commit | ddd875ad9940c4c7ef53a31af23cd5fe89fcf0c9 (patch) | |
| tree | 7926abdec378339ee622a1f09b9a52178f4d0600 /app/lib/activitypub/activity/create.rb | |
| parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) | |
| parent | 66ac1bd063882f5a2f828c1c702089e37f36f217 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index f55dd35b2..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) @@ -380,7 +380,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def skip_download? return @skip_download if defined?(@skip_download) - @skip_download ||= DomainBlock.find_by(domain: @account.domain)&.reject_media? + @skip_download ||= DomainBlock.reject_media?(@account.domain) end def reply_to_local? |