Merge remote-tracking branch 'upstream/develop' into search

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

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index dc826e33159e8aa15b3c0af7bff243cec77663a5..b16ad7705f8a00af02f2b403392ebb2bbd187ae1 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,12 +23,9 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
-use Friendica\Model\Contact;
-use Friendica\Model\GServer;
 use Friendica\Model\Post;
+use Friendica\Model\User;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Util\HTTPSignature;
-
 class APDelivery
 {
        /**
@@ -46,65 +43,51 @@ class APDelivery
        public static function execute(string $cmd, int $item_id, string $inbox, int $uid, array $receivers = [], int $uri_id = 0)
        {
                if (ActivityPub\Transmitter::archivedInbox($inbox)) {
-                       Logger::info('Inbox is archived', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uid' => $uid]);
-                       if (in_array($cmd, [Delivery::POST])) {
+                       Logger::info('Inbox is archived', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
+                       if (empty($uri_id) && !empty($item_id)) {
                                $item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
-                               Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? 0);
+                               $uri_id = $item['uri-id'] ?? 0;
                        }
-                       return;
-               }
-
-               Logger::info('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
-
-               $success = true;
-
-               if ($cmd == Delivery::MAIL) {
-                       $data = ActivityPub\Transmitter::createActivityFromMail($item_id);
-                       if (!empty($data)) {
-                               $success = HTTPSignature::transmit($data, $inbox, $uid);
-                       }
-               } elseif ($cmd == Delivery::SUGGESTION) {
-                       $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_id);
-               } elseif ($cmd == Delivery::RELOCATION) {
-                       // @todo Implementation pending
-               } elseif ($cmd == Delivery::POKE) {
-                       // Implementation not planned
-               } elseif ($cmd == Delivery::REMOVAL) {
-                       $success = ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox);
-               } elseif ($cmd == Delivery::PROFILEUPDATE) {
-                       $success = ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox);
-               } else {
-                       $data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id);
-                       if (!empty($data)) {
-                               $success = HTTPSignature::transmit($data, $inbox, $uid);
+                       if (empty($uri_id)) {
+                               $posts   = Post\Delivery::selectForInbox($inbox);
+                               $uri_ids = array_column($posts, 'uri-id');
+                       } else {
+                               $uri_ids = [$uri_id];
                        }
-               }
-
-               $gsid = null;
 
-               foreach ($receivers as $receiver) {
-                       $contact = Contact::getById($receiver);
-                       if (empty($contact)) {
-                               continue;
+                       foreach ($uri_ids as $uri_id) {
+                               Post\Delivery::remove($uri_id, $inbox);
+                               Post\DeliveryData::incrementQueueFailed($uri_id);
                        }
+                       return;
+               }
 
-                       $gsid = $gsid ?: $contact['gsid'];
+               Logger::debug('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
 
-                       if ($success) {
-                               Contact::unmarkForArchival($contact);
-                       } else {
-                               Contact::markForArchival($contact);
+               if (empty($uri_id)) {
+                       $result  = ActivityPub\Delivery::deliver($inbox);
+                       $success = $result['success'];
+                       $drop    = false;
+                       $uri_ids = $result['uri_ids'];
+               } else {
+                       $owner = User::getOwnerDataById($uid);
+                       if (!$owner) {
+                               Post\Delivery::remove($uri_id, $inbox);
+                               Post\Delivery::incrementFailed($uri_id, $inbox);
+                               return;
                        }
-               }
 
-               if (!empty($gsid)) {
-                       GServer::setProtocol($gsid, Post\DeliveryData::ACTIVITYPUB);
+                       $result  = ActivityPub\Delivery::deliverToInbox($cmd, $item_id, $inbox, $owner, $receivers, $uri_id);
+                       $success = $result['success'];
+                       $drop    = $result['drop'];
+                       $uri_ids = [$uri_id];
                }
 
-               if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueFailed($uri_id);
-               } elseif ($success && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
+               if (!$drop && !$success && !Worker::defer() && !empty($uri_ids)) {
+                       foreach ($uri_ids as $uri_id) {
+                               Post\Delivery::remove($uri_id, $inbox);
+                               Post\DeliveryData::incrementQueueFailed($uri_id);
+                       }
                }
        }
 }