X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FFetchMissingActivity.php;h=d48d834c672e1a4b8871420465d6744fc07ba539;hb=df6cda8a4de30f55c126b95095c026e5b961c27c;hp=ae0f8a7fbf167d8da167b5372aff5b680e1dca72;hpb=c2b2e8ae9f3a87261f048e83fc04078604be3840;p=friendica.git

diff --git a/src/Worker/FetchMissingActivity.php b/src/Worker/FetchMissingActivity.php
index ae0f8a7fbf..d48d834c67 100644
--- a/src/Worker/FetchMissingActivity.php
+++ b/src/Worker/FetchMissingActivity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +23,7 @@ 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;
@@ -32,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)
 	{
@@ -39,10 +42,14 @@ class FetchMissingActivity
 		$result = ActivityPub\Processor::fetchMissingActivity($url, $child, $relay_actor, $completion);
 		if ($result) {
 			Logger::info('Successfully fetched missing activity', ['url' => $url]);
-			Queue::processReplyByUri($url);
 		} elseif (!Worker::defer()) {
-			// @todo perform recursive deletion of all entries
 			Logger::info('Activity could not be fetched', ['url' => $url]);
+
+			// 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]);
 		}