projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/missing-deprecation' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
attachment_validator.ex
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 4a0d1473de8e755f9def08c247641f7a21036e6e..837787b9fcd3955583d1121823cc84e1ccb3c1b8 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
@@
-20,6
+20,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
field(:type, :string)
field(:href, ObjectValidators.Uri)
field(:mediaType, :string, default: "application/octet-stream")
field(:type, :string)
field(:href, ObjectValidators.Uri)
field(:mediaType, :string, default: "application/octet-stream")
+ field(:width, :integer)
+ field(:height, :integer)
end
end
end
end
@@
-51,7
+53,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
data = fix_media_type(data)
struct
data = fix_media_type(data)
struct
- |> cast(data, [:type, :href, :mediaType])
+ |> cast(data, [:type, :href, :mediaType
, :width, :height
])
|> validate_inclusion(:type, ["Link"])
|> validate_required([:type, :href, :mediaType])
end
|> validate_inclusion(:type, ["Link"])
|> validate_required([:type, :href, :mediaType])
end
@@
-59,7
+61,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
def fix_media_type(data) do
data = Map.put_new(data, "mediaType", data["mimeType"])
def fix_media_type(data) do
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
else
Map.put(data, "mediaType", "application/octet-stream")
data
else
Map.put(data, "mediaType", "application/octet-stream")