Issue 11776 - process replies via a worker task

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index db8f28aa0cabcac4d6f2927a99c9e115db9126ca..30f6627ba33f77b91290597e08b06f43fea05249 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -980,7 +980,11 @@ class Processor
 
                if ($success) {
                        Queue::remove($activity);
-                       Queue::processReplyByUri($item['uri']);
+
+                       if (Queue::hasChildren($item['uri'])) {
+                               //Queue::processReplyByUri($item['uri']);
+                               Worker::add(PRIORITY_HIGH, 'ProcessReplyByUri', $item['uri']);
+                       }
                }
 
                // Store send a follow request for every reshare - but only when the item had been stored

diff --git a/src/Protocol/ActivityPub/Queue.php b/src/Protocol/ActivityPub/Queue.php
index d47007eb13db42b97bd43e47354e7e96668fda16..b389626a3ec0a5bcc365b32c70eb05505d9959da 100644 (file)
--- a/src/Protocol/ActivityPub/Queue.php
+++ b/src/Protocol/ActivityPub/Queue.php
@@ -25,7 +25,6 @@ use Friendica\Core\Logger;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\JsonLD;
 
@@ -242,15 +241,30 @@ class Queue
         * Process all activities that are children of a given post url
         *
         * @param string $uri
-        * @return void
+        * @return int
         */
-       public static function processReplyByUri(string $uri)
+       public static function processReplyByUri(string $uri): int
        {
+               $count = 0;
                $entries = DBA::select('inbox-entry', ['id'], ["`in-reply-to-id` = ? AND `object-id` != ?", $uri, $uri]);
                while ($entry = DBA::fetch($entries)) {
+                       $count += 1;
                        self::process($entry['id']);
                }
                DBA::close($entries);
+               return $count;
+       }
+
+       /**
+        * Checks if there are children of the given uri
+        *
+        * @param string $uri
+        *
+        * @return bool
+        */
+       public static function hasChildren(string $uri): bool
+       {
+               return DBA::exists('inbox-entry', ["`in-reply-to-id` = ? AND `object-id` != ?", $uri, $uri]);
        }
 
        /**

diff --git a/src/Worker/ProcessReplyByUri.php b/src/Worker/ProcessReplyByUri.php
new file mode 100644 (file)
index 0000000..000327b
--- /dev/null
+++ b/src/Worker/ProcessReplyByUri.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Worker;
+
+use Friendica\Core\Logger;
+use Friendica\Protocol\ActivityPub\Queue;
+
+class ProcessReplyByUri
+{
+       /**
+        * Process queued replies
+        *
+        * @param string $uri post url
+        *
+        * @return void
+        */
+       public static function execute(string $uri)
+       {
+               Logger::info('Start processing queued replies', ['url' => $uri]);
+               $count = Queue::processReplyByUri($uri);
+               Logger::info('Successfully processed queued replies', ['count' => $count, 'url' => $uri]);
+       }
+}