aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-06-09 10:46:35 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-06-09 10:46:35 +0300
commit235a949d3b1038320cfe54a5bb55d944a2b4a1e7 (patch)
tree62c9cc03c3c24bc7ebf379183defa68078638d65 /lib
parent4e27cd52077b856d3dc02016cea642ac58f0bbfd (diff)
parent674efb0ad2b34cbd4bbb32d414a2c8fa8719cc02 (diff)
downloadpleroma-235a949d3b1038320cfe54a5bb55d944a2b4a1e7.tar.gz
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index fda1c71df..543972ae9 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -221,9 +221,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
media_type =
cond do
- is_map(url) && is_binary(url["mediaType"]) -> url["mediaType"]
- is_binary(data["mediaType"]) -> data["mediaType"]
- is_binary(data["mimeType"]) -> data["mimeType"]
+ is_map(url) && MIME.valid?(url["mediaType"]) -> url["mediaType"]
+ MIME.valid?(data["mediaType"]) -> data["mediaType"]
+ MIME.valid?(data["mimeType"]) -> data["mimeType"]
true -> nil
end