From f222e9d278c9d483a48b5dd10196ef78f205d0b3 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 4 Aug 2022 21:52:10 +0000 Subject: [PATCH] Avoid to provess the same activity --- src/Protocol/ActivityPub/Processor.php | 24 ++++++++++++++++++++++++ src/Protocol/ActivityPub/Queue.php | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 7270f7fc4b..92aa3b7833 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -59,6 +59,23 @@ class Processor { const CACHEKEY_FETCH_ACTIVITY = 'processor:fetchMissingActivity:'; const CACHEKEY_JUST_FETCHED = 'processor:isJustFetched:'; + + static $processed = []; + + public static function addActivityId(string $id) + { + self::$processed[] = $id; + if (count(self::$processed) > 100) { + self::$processed = array_slice(self::$processed, 1); + } + print_r(self::$processed); + } + + public static function isProcessed(string $id): bool + { + return in_array($id, self::$processed); + } + /** * Extracts the tag character (#, @, !) from mention links * @@ -275,6 +292,13 @@ class Processor */ public static function createItem(array $activity, bool $fetch_parents = true): array { + if (self::isProcessed($activity['id'])) { + Logger::info('Id is already processed', ['id' => $activity['id']]); + return []; + } + + self::addActivityId($activity['id']); + $item = []; $item['verb'] = Activity::POST; $item['thr-parent'] = $activity['reply-to-id']; diff --git a/src/Protocol/ActivityPub/Queue.php b/src/Protocol/ActivityPub/Queue.php index 2fa95897c6..df4236b5bd 100644 --- a/src/Protocol/ActivityPub/Queue.php +++ b/src/Protocol/ActivityPub/Queue.php @@ -22,6 +22,7 @@ namespace Friendica\Protocol\ActivityPub; use Friendica\Core\Logger; +use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; @@ -199,7 +200,7 @@ class Queue } } - Logger::debug('Processing queue entry', ['id' => $entry['id'], 'type' => $entry['type'], 'object-type' => $entry['object-type'], 'uri' => $entry['object-id'], 'in-reply-to' => $entry['in-reply-to-id']]); + Logger::debug('Processing queue entry', ['id' => $entry['id'], 'type' => $entry['type'], 'object-type' => $entry['object-type'], 'uri' => $entry['object-id'], 'in-reply-to' => $entry['in-reply-to-id'], 'callstack' => System::callstack(20)]); $activity = json_decode($entry['activity'], true); $type = $entry['type']; -- 2.39.5