Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 11:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Decouple the processor from the receiver

Browse source
This commit is contained in:
Michael 2022-07-27 20:59:42 +00:00
parent 3af55de978
commit 505191dec5
4 changed files with 57 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -982,7 +982,6 @@ class Processor
Queue::remove($activity);
if (Queue::hasChildren($item['uri'])) {
//Queue::processReplyByUri($item['uri']);
Worker::add(PRIORITY_HIGH, 'ProcessReplyByUri', $item['uri']);
}
}

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

@ -167,13 +167,14 @@ class Queue
* Process the activity with the given id
*
* @param integer $id
* @return void
*
* @return bool
*/
public static function process(int $id)
public static function process(int $id): bool
{
$entry = DBA::selectFirst('inbox-entry', [], ['id' => $id]);
if (empty($entry)) {
return;
return false;
}
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']]);
@ -197,6 +198,8 @@ class Queue
if (!Receiver::routeActivities($activity, $type, $push)) {
self::remove($activity);
}
return true;
}
/**

9
src/Protocol/ActivityPub/Receiver.php
View file

@ -28,6 +28,7 @@ use Friendica\Content\Text\Markdown;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\APContact;
@ -36,6 +37,7 @@ use Friendica\Model\Post;
use Friendica\Model\User;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPSignature;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
@ -597,6 +599,13 @@ class Receiver
return;
}
if ($push) {
// We delay by 5 seconds to allow to accumulate all receivers
$delayed = date(DateTimeFormat::MYSQL, time() + 5);
Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $delayed], 'ProcessQueue', $object_data['entry-id']);
return;
}
if (!empty($activity['recursion-depth'])) {
$object_data['recursion-depth'] = $activity['recursion-depth'];
}