projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AcceptValidation: Codify accept rules.
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
create_generic_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
index ff889330ef00a1bda10c687ad5da1818b7c9a966..60868eae08ac83c1fd326227bdae9548d97b777f 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
@@
-29,7
+29,9
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
field(:context, :string)
end
field(:context, :string)
end
- def cast_data(data) do
+ def cast_data(data, meta \\ []) do
+ data = fix(data, meta)
+
%__MODULE__{}
|> changeset(data)
end
%__MODULE__{}
|> changeset(data)
end
@@
-42,7
+44,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
def cast_and_validate(data, meta \\ []) do
data
def cast_and_validate(data, meta \\ []) do
data
- |> cast_data
+ |> cast_data
(meta)
|> validate_data(meta)
end
|> validate_data(meta)
end
@@
-51,11
+53,24
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
|> cast(data, __schema__(:fields))
end
|> cast(data, __schema__(:fields))
end
+ defp fix_context(data, meta) do
+ if object = meta[:object_data] do
+ Map.put_new(data, "context", object["context"])
+ else
+ data
+ end
+ end
+
+ defp fix(data, meta) do
+ data
+ |> fix_context(meta)
+ end
+
def validate_data(cng, meta \\ []) do
cng
|> validate_required([:actor, :type, :object])
|> validate_inclusion(:type, ["Create"])
def validate_data(cng, meta \\ []) do
cng
|> validate_required([:actor, :type, :object])
|> validate_inclusion(:type, ["Create"])
- |> validate_actor_
is_activ
e()
+ |> validate_actor_
presenc
e()
|> validate_any_presence([:to, :cc])
|> validate_actors_match(meta)
|> validate_context_match(meta)
|> validate_any_presence([:to, :cc])
|> validate_actors_match(meta)
|> validate_context_match(meta)