Use plaintext for names and titles

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

diff --git a/src/Worker/BulkDelivery.php b/src/Worker/BulkDelivery.php
index 5e335f720572b541aa4906fcde34dfe790a1a1ab..4ac77b21376fc1c09c809a767ed37645fae3b094 100644 (file)
--- a/src/Worker/BulkDelivery.php
+++ b/src/Worker/BulkDelivery.php
@@ -23,6 +23,7 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
+use Friendica\DI;
 use Friendica\Model\GServer;
 use Friendica\Protocol\Delivery as ProtocolDelivery;
 
@@ -33,19 +34,19 @@ class BulkDelivery
                $server_failure   = false;
                $delivery_failure = false;
 
-               $posts = ProtocolDelivery::selectQueueForServer($gsid);
-               foreach ($posts as $post) {
-                       if (!$server_failure && ProtocolDelivery::deliver($post['command'], $post['uri-id'], $post['cid'], $post['uid'])) {
-                               ProtocolDelivery::removeQueue($post['uri-id'], $post['gsid']);
-                               Logger::debug('Delivery successful', $post);
+               $deliveryQueueItems = DI::deliveryQueueItemRepo()->selectByServerId($gsid, DI::config()->get('system', 'worker_defer_limit'));
+               foreach ($deliveryQueueItems as $deliveryQueueItem) {
+                       if (!$server_failure && ProtocolDelivery::deliver($deliveryQueueItem->command, $deliveryQueueItem->postUriId, $deliveryQueueItem->targetContactId, $deliveryQueueItem->senderUserId)) {
+                               DI::deliveryQueueItemRepo()->remove($deliveryQueueItem);
+                               Logger::debug('Delivery successful', $deliveryQueueItem->toArray());
                        } else {
-                               ProtocolDelivery::incrementFailedQueue($post['uri-id'], $post['gsid']);
+                               DI::deliveryQueueItemRepo()->incrementFailed($deliveryQueueItem);
                                $delivery_failure = true;
 
                                if (!$server_failure) {
                                        $server_failure = !GServer::isReachableById($gsid);
                                }
-                               Logger::debug('Delivery failed', ['server_failure' => $server_failure, 'post' => $post]);
+                               Logger::debug('Delivery failed', ['server_failure' => $server_failure, 'post' => $deliveryQueueItem]);
                        }
                }
 
@@ -54,7 +55,7 @@ class BulkDelivery
                }
 
                if ($delivery_failure) {
-                       ProtocolDelivery::removeFailedQueue($gsid);
+                       DI::deliveryQueueItemRepo()->removeFailedByServerId($gsid, DI::config()->get('system', 'worker_defer_limit'));
                }
        }
 }