From ab89e89b40106d8db9d1a5e6cced76bc4902e01f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 8 Apr 2023 06:08:45 +0000 Subject: [PATCH] Issue 12977: Ensure to fetch quoted posts --- src/Protocol/ActivityPub/Receiver.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 468af6c72f..a528676163 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -630,7 +630,7 @@ class Receiver $object_data['object_activity'] = $activity; } - if (($type == 'as:Create') && $trust_source) { + if (($type == 'as:Create') && $trust_source && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUNCE])) { if (self::hasArrived($object_data['object_id'])) { Logger::info('The activity already arrived.', ['id' => $object_data['object_id']]); return true; @@ -641,6 +641,8 @@ class Receiver Logger::info('The activity is already added.', ['id' => $object_data['object_id']]); return true; } + } elseif (($type == 'as:Create') && $trust_source && !self::hasArrived($object_data['object_id'])) { + self::addArrivedId($object_data['object_id']); } $decouple = DI::config()->get('system', 'decoupled_receiver') && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUNCE]);