Merge pull request #11643 from annando/avatar-path

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 0ce5ed92a781406417ac199f75407e2e0b472aab..2039448e1449bc15f1c00b12a913e57095ea24ea 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -754,7 +754,6 @@ class Notifier
 
                        if (in_array($target_item['private'], [Item::PUBLIC])) {
                                $inboxes = ActivityPub\Transmitter::addRelayServerInboxesForItem($parent['id'], $inboxes);
-                               $relay_inboxes = ActivityPub\Transmitter::addRelayServerInboxes([]);
                        }
 
                        Logger::info('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.');
@@ -787,11 +786,9 @@ class Notifier
                        Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
 
                        if (DI::config()->get('system', 'bulk_delivery')) {
-                               if (Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
-                                               'APDelivery', $cmd, 0, $inbox, $uid)) {
-                                       $delivery_queue_count++;
-                                       Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd);
-                               }
+                               $delivery_queue_count++;
+                               Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd, $receivers);
+                               Worker::add(PRIORITY_HIGH, 'APDelivery', '', 0, $inbox, 0);
                        } else {
                                if (Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
                                                'APDelivery', $cmd, $target_item['id'], $inbox, $uid, $receivers, $target_item['uri-id'])) {
@@ -805,10 +802,9 @@ class Notifier
                        Logger::info('Delivery to relay servers via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
 
                        if (DI::config()->get('system', 'bulk_delivery')) {
-                               if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, 0, $inbox, $uid)) {
-                                       $delivery_queue_count++;
-                                       Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd);
-                               }
+                               $delivery_queue_count++;
+                               Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd, []);
+                               Worker::add(PRIORITY_MEDIUM, 'APDelivery', '', 0, $inbox, 0);
                        } else {
                                if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, [], $target_item['uri-id'])) {
                                        $delivery_queue_count++;