Merge remote-tracking branch 'upstream/2023.05-rc' into quote-loop

[friendica.git] / src / Protocol / ActivityPub / Queue.php

diff --git a/src/Protocol/ActivityPub/Queue.php b/src/Protocol/ActivityPub/Queue.php
index 25b431c1b047a8f9be79d3179879e8aa373cf236..beb8817bfbdfaa65f15ee15fe6dc299b07a5e865 100644 (file)
--- a/src/Protocol/ActivityPub/Queue.php
+++ b/src/Protocol/ActivityPub/Queue.php
@@ -236,7 +236,7 @@ class Queue
                }
                DBA::close($receivers);
 
-               if (!Receiver::routeActivities($activity, $type, $push, $fetch_parents)) {
+               if (!Receiver::routeActivities($activity, $type, $push, $fetch_parents, $activity['receiver'][0] ?? 0)) {
                        self::remove($activity);
                }
 
@@ -252,7 +252,7 @@ class Queue
        {
                $entries = DBA::select('inbox-entry', ['id', 'type', 'object-type', 'object-id', 'in-reply-to-id'], ["`trust` AND `wid` IS NULL"], ['order' => ['id' => true]]);
                while ($entry = DBA::fetch($entries)) {
-                       // Don't process entries of items that are answer to non existing posts
+                       // Don't process entries of items that are answer to nonexistent posts
                        if (!empty($entry['in-reply-to-id']) && !Post::exists(['uri' => $entry['in-reply-to-id']])) {
                                continue;
                        }
@@ -312,7 +312,7 @@ class Queue
                // Optimizing this table only last seconds
                if (DI::config()->get('system', 'optimize_tables')) {
                        Logger::info('Optimize start');
-                       DBA::e("OPTIMIZE TABLE `inbox-entry`");
+                       DBA::optimizeTable('inbox-entry');
                        Logger::info('Optimize end');
                }
        }