aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-18 20:17:28 +0200
committerlain <lain@soykaf.club>2020-05-18 20:17:28 +0200
commitd19c7167704308df093f060082639c0a15996af7 (patch)
treea8865220357c777318a95965583b3b3a4c4799f3 /lib
parentbe4db41d713f981cc464e5fa7bc7191d3ff776d6 (diff)
downloadpleroma-d19c7167704308df093f060082639c0a15996af7.tar.gz
AttachmentValidator: Handle empty mediatypes
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex14
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
index 16ed49051..c4b502cb9 100644
--- a/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
@primary_key false
embedded_schema do
field(:type, :string)
- field(:mediaType, :string)
+ field(:mediaType, :string, default: "application/octet-stream")
field(:name, :string)
embeds_many(:url, UrlObjectValidator)
@@ -41,8 +41,16 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
end
def fix_media_type(data) do
- data
- |> Map.put_new("mediaType", data["mimeType"])
+ data =
+ data
+ |> Map.put_new("mediaType", data["mimeType"])
+
+ if data["mediaType"] == "" do
+ data
+ |> Map.put("mediaType", "application/octet-stream")
+ else
+ data
+ end
end
def fix_url(data) do