Merge pull request #12277 from nupplaphil/mod/fbrowser

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

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index c98f1e399322e9d02725f08e45e41fe36fa99f9b..203c4097612d97fd04812d0dae80c8c57c50bfb3 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,105 +23,63 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
-use Friendica\Model\Contact;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Util\HTTPSignature;
-
 class APDelivery
 {
        /**
         * Delivers ActivityPub messages
         *
-        * @param string       $cmd
-        * @param integer      $target_id
-        * @param string|array $inboxes
-        * @param integer      $uid
-        * @param array        $receivers
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        * @throws \ImagickException
-        */
-       public static function execute(string $cmd, int $target_id, $inboxes, int $uid, array $receivers = [])
-       {
-               if (is_string($inboxes)) {
-                       $inboxes = [$inboxes];
-               }
-
-               foreach ($inboxes as $inbox) {
-                       self::perform($cmd, $target_id, $inbox, $uid, $receivers);
-               }
-       }
-
-       /**
-        * Delivers ActivityPub messages
-        *
-        * @param string  $cmd
-        * @param integer $target_id
-        * @param string  $inbox
-        * @param integer $uid
-        * @param array   $receivers
+        * @param string  $cmd       One of the Worker\Delivery constant values
+        * @param integer $item_id   0 if no item is involved (like Delivery::REMOVAL and Delivery::PROFILEUPDATE)
+        * @param string  $inbox     The URL of the recipient profile
+        * @param integer $uid       The ID of the user who triggered this delivery
+        * @param array   $receivers The contact IDs related to the inbox URL for contact archival housekeeping
+        * @param int     $uri_id    URI-ID of item to be transmitted
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function perform(string $cmd, int $target_id, string $inbox, int $uid, array $receivers = [])
+       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' => $target_id, 'uid' => $uid]);
-                       if (in_array($cmd, [Delivery::POST])) {
-                               $item = Item::selectFirst(['uri-id'], ['id' => $target_id]);
-                               Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? 0);
+                       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]);
+                               $uri_id = $item['uri-id'] ?? 0;
+                       }
+                       if (empty($uri_id)) {
+                               $posts   = Post\Delivery::selectForInbox($inbox);
+                               $uri_ids = array_column($posts, 'uri-id');
+                       } else {
+                               $uri_ids = [$uri_id];
+                       }
+
+                       foreach ($uri_ids as $uri_id) {
+                               Post\Delivery::remove($uri_id, $inbox);
+                               Post\DeliveryData::incrementQueueFailed($uri_id);
                        }
                        return;
                }
 
-               Logger::info('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $target_id, 'uid' => $uid]);
+               Logger::debug('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
 
-               $success = true;
-
-               if ($cmd == Delivery::MAIL) {
-                       $data = ActivityPub\Transmitter::createActivityFromMail($target_id);
-                       if (!empty($data)) {
-                               $success = HTTPSignature::transmit($data, $inbox, $uid);
-                       }
-               } elseif ($cmd == Delivery::SUGGESTION) {
-                       $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $target_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);
+               if (empty($uri_id)) {
+                       $result  = ActivityPub\Delivery::deliver($inbox);
+                       $success = $result['success'];
+                       $drop    = false;
+                       $uri_ids = $result['uri_ids'];
                } else {
-                       $data = ActivityPub\Transmitter::createCachedActivityFromItem($target_id);
-                       if (!empty($data)) {
-                               $success = HTTPSignature::transmit($data, $inbox, $uid);
-                       }
+                       $result  = ActivityPub\Delivery::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
+                       $success = $result['success'];
+                       $drop    = $result['drop'];
+                       $uri_ids = [$uri_id];
                }
 
-               // This should never fail and is temporariy (until the move to the "post" structure)
-               $item = Item::selectFirst(['uri-id'], ['id' => $target_id]);
-               $uriid = $item['uri-id'] ?? 0;
-
-               foreach ($receivers as $receiver) {
-                       $contact = Contact::getById($receiver);
-                       if (empty($contact)) {
-                               continue;
-                       }
-
-                       if ($success) {
-                               Contact::unmarkForArchival($contact);
-                       } else {
-                               Contact::markForArchival($contact);
+               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);
                        }
                }
-
-               if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueFailed($uriid);
-               } elseif ($success && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB);
-               }
        }
 }