From ebd67f9e36af0eff478cf8f1df10badf659b739e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 22 May 2021 14:12:15 -0500 Subject: Cycles: just don't autogenerate context in AnnounceValidator None of the other validators do it and it's not worth creating a compile-time dep on Endpoint --- lib/pleroma/web/activity_pub/object_validators/announce_validator.ex | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex b/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex index 62767fced..b04449f44 100644 --- a/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex +++ b/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex @@ -24,7 +24,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do field(:type, :string) field(:object, ObjectValidators.ObjectID) field(:actor, ObjectValidators.ObjectID) - field(:context, :string, autogenerate: {IDs, :generate_context_id, []}) + field(:context, :string) field(:to, ObjectValidators.Recipients, default: []) field(:cc, ObjectValidators.Recipients, default: []) field(:published, ObjectValidators.DateTime) @@ -69,11 +69,10 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do false <- Visibility.is_public?(object) do same_actor = object.data["actor"] == actor.ap_id recipients = get_field(cng, :to) ++ get_field(cng, :cc) - local_public = IDs.as_local_public() is_public = Enum.member?(recipients, Pleroma.Constants.as_public()) or - Enum.member?(recipients, local_public) + Enum.member?(recipients, IDs.as_local_public()) cond do same_actor && is_public -> -- cgit v1.2.3