From 065fad31f155700f5d1280ed5f94b6871c3a262e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 6 May 2020 21:19:48 +0000 Subject: [PATCH] ignore "follow" activities that are not from the user --- src/Model/Item.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index ff3ec9a72e..44e00b09b3 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1994,7 +1994,8 @@ class Item 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']) { + if (($transmit_item['verb'] == Activity::FOLLOW) && + (!$transmit_item['origin'] || ($item['author-id'] != Contact::getPublicIdByUserId($uid)))) { Logger::info('Participation messages will not be relayed', ['item' => $item['id'], 'uri' => $item['uri'], 'verb' => $transmit_item['verb']]); $transmit = false; }