Ignore if the worker was added

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 5ec35a656b0b4db8dc84d82c67849ff721561d0d..48b81b9a99c9e9e24753e5f87aca7dff39584d24 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -786,10 +786,15 @@ class Notifier
 
                        Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
 
-                       if (Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
-                                       'APDelivery', $cmd, 0, $inbox, $uid)) {
+                       if (DI::config()->get('system', 'bulk_delivery')) {
                                $delivery_queue_count++;
                                Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd);
+                               Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, 0, $inbox, $uid);
+                       } else {
+                               if (Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
+                                               'APDelivery', $cmd, $target_item['id'], $inbox, $uid, $receivers, $target_item['uri-id'])) {
+                                       $delivery_queue_count++;
+                               }
                        }
                }
 
@@ -797,9 +802,14 @@ class Notifier
                foreach ($relay_inboxes as $inbox) {
                        Logger::info('Delivery to relay servers via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
 
-                       if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, 0, $inbox, $uid)) {
+                       if (DI::config()->get('system', 'bulk_delivery')) {
                                $delivery_queue_count++;
                                Post\Delivery::add($target_item['uri-id'], $uid, $inbox, $target_item['created'], $cmd);
+                               Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, 0, $inbox, $uid);
+                       } else {
+                               if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, [], $target_item['uri-id'])) {
+                                       $delivery_queue_count++;
+                               }
                        }
                }