diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-05-17 19:04:51 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-05-17 19:04:51 +0000 |
commit | 0524e66a05170519d22a9bfc096440664ed1cfee (patch) | |
tree | ae1ffc694b35fbb506d49e6d0f0160a630ad5f85 /lib | |
parent | ce1c0f75cdde09243ed0f6983d3dff3458386f24 (diff) | |
parent | 98b9c1bcb10a913c7c0c489ad2c99846f8257aa0 (diff) | |
download | pleroma-0524e66a05170519d22a9bfc096440664ed1cfee.tar.gz pleroma-0524e66a05170519d22a9bfc096440664ed1cfee.zip |
Merge branch 'accept-tags-2.5' into 'develop'
TagValidator: Drop unrecognized Tag types
Closes #2952
See merge request pleroma/pleroma!3823
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/object_validators/tag_validator.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex b/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex index 9f15f1981..cfd510c19 100644 --- a/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex +++ b/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex @@ -68,6 +68,12 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.TagValidator do |> validate_required([:type, :name, :icon]) end + def changeset(struct, %{"type" => _} = data) do + struct + |> cast(data, []) + |> Map.put(:action, :ignore) + end + def icon_changeset(struct, data) do struct |> cast(data, [:type, :url]) |