Detection of local requests

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

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 7173475befa5117a635f06385bc21eedf6053fa8..7af50c67e4bfb597acff85868e3b6093fa114150 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-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,7 +24,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Model\Contact;
-use Friendica\Model\Item;
+use Friendica\Model\GServer;
 use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
@@ -34,36 +34,37 @@ class APDelivery
        /**
         * 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
         */
-       public static function execute($cmd, $target_id, $inbox, $uid, $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]);
+                       Logger::info('Inbox is archived', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uid' => $uid]);
                        if (in_array($cmd, [Delivery::POST])) {
-                               $item = Item::selectFirst(['uri-id'], ['id' => $target_id]);
+                               $item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
                                Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? 0);
                        }
                        return;
                }
 
-               Logger::info('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $target_id, 'uid' => $uid]);
+               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($target_id);
+                       $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, $target_id);
+                       $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_id);
                } elseif ($cmd == Delivery::RELOCATION) {
                        // @todo Implementation pending
                } elseif ($cmd == Delivery::POKE) {
@@ -73,15 +74,13 @@ class APDelivery
                } elseif ($cmd == Delivery::PROFILEUPDATE) {
                        $success = ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox);
                } else {
-                       $data = ActivityPub\Transmitter::createCachedActivityFromItem($target_id);
+                       $data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id);
                        if (!empty($data)) {
                                $success = HTTPSignature::transmit($data, $inbox, $uid);
                        }
                }
 
-               // 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;
+               $gsid = null;
 
                foreach ($receivers as $receiver) {
                        $contact = Contact::getById($receiver);
@@ -89,6 +88,8 @@ class APDelivery
                                continue;
                        }
 
+                       $gsid = $gsid ?: $contact['gsid'];
+
                        if ($success) {
                                Contact::unmarkForArchival($contact);
                        } else {
@@ -96,10 +97,14 @@ class APDelivery
                        }
                }
 
+               if (!empty($gsid)) {
+                       GServer::setProtocol($gsid, Post\DeliveryData::ACTIVITYPUB);
+               }
+
                if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueFailed($uriid);
+                       Post\DeliveryData::incrementQueueFailed($uri_id);
                } elseif ($success && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB);
+                       Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
                }
        }
 }