projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply Patch
[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 59fef42d6cc8c1b7b7046d623f95dfce75014b14..dba18a3d0b2baf2000f043c3a6773b8e465f3d40 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
@@
-11,6
+11,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
@primary_key false
embedded_schema do
@primary_key false
embedded_schema do
+ field(:id, :string)
field(:type, :string)
field(:mediaType, :string, default: "application/octet-stream")
field(:name, :string)
field(:type, :string)
field(:mediaType, :string, default: "application/octet-stream")
field(:name, :string)
@@
-43,10
+44,10
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
|> fix_url()
struct
|> fix_url()
struct
- |> cast(data, [:type, :mediaType, :name, :blurhash])
- |> cast_embed(:url, with: &url_changeset/2)
+ |> cast(data, [:
id, :
type, :mediaType, :name, :blurhash])
+ |> cast_embed(:url, with: &url_changeset/2
, required: true
)
|> validate_inclusion(:type, ~w[Link Document Audio Image Video])
|> validate_inclusion(:type, ~w[Link Document Audio Image Video])
- |> validate_required([:type, :mediaType
, :url
])
+ |> validate_required([:type, :mediaType])
end
def url_changeset(struct, data) do
end
def url_changeset(struct, data) do
@@
-96,6
+97,6
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
defp validate_data(cng) do
cng
|> validate_inclusion(:type, ~w[Document Audio Image Video])
defp validate_data(cng) do
cng
|> validate_inclusion(:type, ~w[Document Audio Image Video])
- |> validate_required([:mediaType, :
url, :
type])
+ |> validate_required([:mediaType, :type])
end
end
end
end