diff options
| author | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
| commit | 3fa90982efda2109ddf90d81f5ed3449f8282642 (patch) | |
| tree | e5514f4c72c9ffb44059a2afb7fdf24d0348bbd4 /app/lib/activitypub | |
| parent | 714940de498e93a8bf40dcda1835217df18741bf (diff) | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 4 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/flag.rb | 2 |
2 files changed, 3 insertions, 3 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? diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb index f73b93058..1659bc61f 100644 --- a/app/lib/activitypub/activity/flag.rb +++ b/app/lib/activitypub/activity/flag.rb @@ -23,7 +23,7 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity private def skip_reports? - DomainBlock.find_by(domain: @account.domain)&.reject_reports? + DomainBlock.reject_reports?(@account.domain) end def object_uris |