pleroma

commit: 674efb0ad2b34cbd4bbb32d414a2c8fa8719cc02
parent: d1924926585a477682b8fcc3176521dacb0766dd
Author: lain <lain@soykaf.club>
Date:   Tue,  9 Jun 2020 07:32:43 +0000

Merge branch 'features/mediatype-mime-valid' into 'develop'

transmogrifier: MIME.valid?/1 for mediaType

See merge request pleroma/pleroma!2634
Diffstat:
M
lib/pleroma/web/activity_pub/transmogrifier.ex
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git 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