From b7e461d2f38c63f7e5a27ac9b714f3ae1f6b9134 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 27 Dec 2022 17:01:40 +0000 Subject: [PATCH] Improved handling of forum mentions --- src/Protocol/ActivityPub/Transmitter.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 6b0064c3e..66ee9e4b5 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -674,6 +674,7 @@ class Transmitter } $exclusive = false; + $mention = false; if ($is_forum_thread) { foreach (Tag::getByURIId($item['parent-uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]) as $term) { @@ -682,7 +683,7 @@ class Transmitter if ($term['type'] == Tag::EXCLUSIVE_MENTION) { $exclusive = true; } elseif ($term['type'] == Tag::MENTION) { - $exclusive = false; + $mention = true; } } } @@ -718,7 +719,7 @@ class Transmitter $data['cc'][] = $profile['followers']; } } elseif (($term['type'] == Tag::MENTION) && ($profile['type'] == 'Group')) { - $exclusive = false; + $mention = true; } $data['to'][] = $profile['url']; } @@ -742,13 +743,17 @@ class Transmitter $data['cc'][] = $profile['followers']; } } elseif (($term['type'] == Tag::MENTION) && ($profile['type'] == 'Group')) { - $exclusive = false; + $mention = true; } $data['to'][] = $profile['url']; } } } + if ($mention) { + $exclusive = false; + } + if ($is_forum && !$exclusive && !empty($follower)) { $data['cc'][] = $follower; } elseif (!$exclusive) {