X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FFetchMissingActivity.php;h=bc7d80f7c538b119e54aa46864a87b0911d981f7;hb=a1d57abfe45d832aa36f9615eea35c6900c6f5b8;hp=ceab8b7338430d4a9361be13b8c0cd348049f16b;hpb=c7758331173ec318d5755e943c9abf9eb76a7bcf;p=friendica.git diff --git a/src/Worker/FetchMissingActivity.php b/src/Worker/FetchMissingActivity.php index ceab8b7338..bc7d80f7c5 100644 --- a/src/Worker/FetchMissingActivity.php +++ b/src/Worker/FetchMissingActivity.php @@ -23,7 +23,9 @@ namespace Friendica\Worker; use Friendica\Core\Logger; use Friendica\Core\Worker; +use Friendica\DI; use Friendica\Protocol\ActivityPub; +use Friendica\Protocol\ActivityPub\Queue; use Friendica\Protocol\ActivityPub\Receiver; class FetchMissingActivity @@ -31,6 +33,8 @@ class FetchMissingActivity /** * Fetch missing activities * @param string $url Contact URL + * + * @return void */ public static function execute(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL) { @@ -40,7 +44,12 @@ class FetchMissingActivity Logger::info('Successfully fetched missing activity', ['url' => $url]); } elseif (!Worker::defer()) { Logger::info('Activity could not be fetched', ['url' => $url]); - // Possibly we should recursively remove child activities at this point. + + // recursively delete all entries that belong to this worker task + $queue = DI::app()->getQueue(); + if (!empty($queue['id'])) { + Queue::deleteByWorkerId($queue['id']); + } } else { Logger::info('Fetching deferred', ['url' => $url]); }