diff options
| author | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
| commit | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (patch) | |
| tree | 0015c7c3ea57f7340fbf80fd230a5f5e1c548148 /lib/pleroma/web/activity_pub/object_validators/announce_validator.ex | |
| parent | c2186a62d54043ea9638d33f80c7576aba9783e8 (diff) | |
| parent | 0a589c887bd4215e7d443a34c194fd0a3bde8f72 (diff) | |
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
Diffstat (limited to 'lib/pleroma/web/activity_pub/object_validators/announce_validator.ex')
| -rw-r--r-- | lib/pleroma/web/activity_pub/object_validators/announce_validator.ex | 9 |
1 files changed, 7 insertions, 2 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 6f757f49c..b08a33e68 100644 --- a/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex +++ b/lib/pleroma/web/activity_pub/object_validators/announce_validator.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do @@ -67,7 +67,12 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do %Object{} = object <- Object.get_cached_by_ap_id(object), false <- Visibility.is_public?(object) do same_actor = object.data["actor"] == actor.ap_id - is_public = Pleroma.Constants.as_public() in (get_field(cng, :to) ++ get_field(cng, :cc)) + recipients = get_field(cng, :to) ++ get_field(cng, :cc) + local_public = Pleroma.Constants.as_local_public() + + is_public = + Enum.member?(recipients, Pleroma.Constants.as_public()) or + Enum.member?(recipients, local_public) cond do same_actor && is_public -> |