tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Avoid to provess the same activity

Browse source
This commit is contained in:
Michael 2022-08-04 21:52:10 +00:00
parent 06f7244280
commit f222e9d278
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Protocol/ActivityPub/Processor.php
View file

@ -59,6 +59,23 @@ class Processor
{ {
const CACHEKEY_FETCH_ACTIVITY = 'processor:fetchMissingActivity:'; const CACHEKEY_FETCH_ACTIVITY = 'processor:fetchMissingActivity:';
const CACHEKEY_JUST_FETCHED = 'processor:isJustFetched:'; 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 * Extracts the tag character (#, @, !) from mention links
* *
@ -275,6 +292,13 @@ class Processor
*/ */
public static function createItem(array $activity, bool $fetch_parents = true): array 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 = [];
$item['verb'] = Activity::POST; $item['verb'] = Activity::POST;
$item['thr-parent'] = $activity['reply-to-id']; $item['thr-parent'] = $activity['reply-to-id'];

3
src/Protocol/ActivityPub/Queue.php
View file

@ -22,6 +22,7 @@
namespace Friendica\Protocol\ActivityPub; namespace Friendica\Protocol\ActivityPub;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; 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); $activity = json_decode($entry['activity'], true);
$type = $entry['type']; $type = $entry['type'];