From be9519708eb3ffa523ef82b2271be610ea999e7e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 6 May 2020 20:43:00 +0000 Subject: [PATCH] Don't relay participation messages --- src/Model/Item.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 17c841fc2f..ff3ec9a72e 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1989,7 +1989,18 @@ class Item check_user_notification($current_post); - if ($notify || ($item['visible'] && ((!empty($parent) && $parent['origin']) || $item['origin']))) { + $transmit = $notify || ($item['visible'] && ((!empty($parent) && $parent['origin']) || $item['origin'])); + + if ($transmit) { + $transmit_item = Item::selectFirst(['verb', 'origin'], ['id' => $item['id']]); + // Don't relay participation messages + if (($transmit_item['verb'] == Activity::FOLLOW) && !$transmit_item['origin']) { + Logger::info('Participation messages will not be relayed', ['item' => $item['id'], 'uri' => $item['uri'], 'verb' => $transmit_item['verb']]); + $transmit = false; + } + } + + if ($transmit) { Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, $current_post); }