floogulinc/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity

MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []

Browse source 
Since mime 1.6.0:

  warning: MIME.valid?/1 is deprecated. Use MIME.extensions(type) != [] instead

As for the bitstring(type) part it's because MIME.extensions only expects a string.
https://github.com/elixir-plug/mime/issues/43
This commit is contained in:
Haelwenn (lanodan) Monnier 2021-05-31 10:41:31 +02:00
parent 24d66b60a0
commit 11844084d0
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
View file

@ -61,7 +61,7 @@ def url_changeset(struct, data) do
def fix_media_type(data) do def fix_media_type(data) do
data = Map.put_new(data, "mediaType", data["mimeType"]) data = Map.put_new(data, "mediaType", data["mimeType"])
if MIME.valid?(data["mediaType"]) do if is_bitstring(data["mediaType"]) && MIME.extensions(data["mediaType"]) != [] do
data data
else else
Map.put(data, "mediaType", "application/octet-stream") Map.put(data, "mediaType", "application/octet-stream")

15
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -203,10 +203,17 @@ def fix_attachments(%{"attachment" => attachment} = object) when is_list(attachm
media_type = media_type =
cond do cond do
is_map(url) && MIME.valid?(url["mediaType"]) -> url["mediaType"] is_map(url) && MIME.extensions(url["mediaType"]) != [] ->
MIME.valid?(data["mediaType"]) -> data["mediaType"] url["mediaType"]
MIME.valid?(data["mimeType"]) -> data["mimeType"]
true -> nil is_bitstring(data["mediaType"]) && MIME.extensions(data["mediaType"]) != [] ->
data["mediaType"]
is_bitstring(data["mimeType"]) && MIME.extensions(data["mimeType"]) != [] ->
data["mimeType"]
true ->
nil
end end
href = href =