From 90e0cae84ec46f8df01b9da0905b188901666635 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 28 Sep 2020 11:36:47 +0000 Subject: [PATCH] Don't display a resharer that was the causer of the post --- include/conversation.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/conversation.php b/include/conversation.php index c50ce6b7cc..6f8c28d725 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1005,6 +1005,14 @@ function builtin_activity_puller($item, &$conv_responses) { continue; } + // Skip when the causer of the parent is the same than the author of the announce + if ($verb == Activity::ANNOUNCE) { + $parent = Item::selectFirst(['causer-id', 'gravity'], ['uri' => $item['thr-parent']]); + if (($parent['causer-id'] == $item['author-id']) && ($parent['gravity'] == GRAVITY_PARENT)) { + continue; + } + } + if (!isset($conv_responses[$mode][$item['thr-parent']])) { $conv_responses[$mode][$item['thr-parent']] = 1; } else {