diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2021-01-12 14:11:29 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2021-04-01 14:18:40 +0200 |
| commit | 5ae27c8451a7012b43ef9113713132158701364b (patch) | |
| tree | d749b14c1d8a7ce18607206513d57dfb1c2792b3 /lib | |
| parent | 9015df22291ab60c0efad328557936fd14eab2e6 (diff) | |
| download | pleroma-5ae27c8451a7012b43ef9113713132158701364b.tar.gz pleroma-5ae27c8451a7012b43ef9113713132158701364b.zip | |
pipeline_test: Fix usage of %Activity{}
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/object_validator.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/pipeline.ex | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/object_validator.ex b/lib/pleroma/web/activity_pub/object_validator.ex index f75744203..15784b28c 100644 --- a/lib/pleroma/web/activity_pub/object_validator.ex +++ b/lib/pleroma/web/activity_pub/object_validator.ex @@ -169,7 +169,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do def cast_and_apply(o), do: {:error, {:validator_not_set, o}} - # is_struct/1 isn't present in Elixir 1.8.x + # is_struct/1 appears in Elixir 1.11 def stringify_keys(%{__struct__: _} = object) do object |> Map.from_struct() diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex index 195596f94..0aa504e72 100644 --- a/lib/pleroma/web/activity_pub/pipeline.ex +++ b/lib/pleroma/web/activity_pub/pipeline.ex @@ -40,6 +40,8 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do end end + def do_common_pipeline(%{__struct__: _}, _meta), do: {:error, :is_struct} + def do_common_pipeline(object, meta) do with {_, {:ok, validated_object, meta}} <- {:validate_object, @object_validator.validate(object, meta)}, |