From fc300607e558ed70cab7a9ebec8cf035be323adb Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 1 Sep 2020 01:20:13 +0300 Subject: [PATCH] [ActivityPub] Check if a Notice is public via CC as well --- plugins/ActivityPub/lib/models/Activitypub_notice.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/ActivityPub/lib/models/Activitypub_notice.php b/plugins/ActivityPub/lib/models/Activitypub_notice.php index 8a1165cc36..dc31565558 100644 --- a/plugins/ActivityPub/lib/models/Activitypub_notice.php +++ b/plugins/ActivityPub/lib/models/Activitypub_notice.php @@ -344,7 +344,8 @@ class Activitypub_notice */ public static function getNotePolicyType(array $note, Profile $actor_profile): int { - if (in_array('https://www.w3.org/ns/activitystreams#Public', $note['to'])) { + $addressee = array_unique(array_merge($note['to'], $note['cc'])); + if (in_array('https://www.w3.org/ns/activitystreams#Public', $addressee)) { return $actor_profile->isLocal() ? Notice::LOCAL_PUBLIC : Notice::REMOTE; } else { // either an unlisted or followers-only note, we'll handle