Merge remote-tracking branch 'upstream/develop' into diaspora-reshare

[friendica.git] / src / Worker / FetchMissingActivity.php

diff --git a/src/Worker/FetchMissingActivity.php b/src/Worker/FetchMissingActivity.php
index 6cb832c779b0051348b161c5d57d9680bfb61324..bc7d80f7c538b119e54aa46864a87b0911d981f7 100644 (file)
--- a/src/Worker/FetchMissingActivity.php
+++ b/src/Worker/FetchMissingActivity.php
@@ -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()) {
                        Logger::info('Activity could not be fetched', ['url' => $url]);
-                       // @todo performe recursive deletion of all entries
+
+                       // 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]);
                }