X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FAPDelivery.php;h=dc826e33159e8aa15b3c0af7bff243cec77663a5;hb=12038d45d0217fd166651477894cc14fc446c33e;hp=60752896fc64b05c224504ecd78c355c4a8114dc;hpb=2ec3a97393959e42d450e074271d2d622d25701f;p=friendica.git

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 60752896fc..dc826e3315 100644
--- 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,7 +23,9 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
-use Friendica\Model\ItemDeliveryData;
+use Friendica\Model\Contact;
+use Friendica\Model\GServer;
+use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
 
@@ -32,26 +34,37 @@ class APDelivery
 	/**
 	 * Delivers ActivityPub messages
 	 *
-	 * @param string  $cmd
-	 * @param integer $target_id
-	 * @param string  $inbox
-	 * @param integer $uid
+	 * @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)
+	public static function execute(string $cmd, int $item_id, string $inbox, int $uid, array $receivers = [], int $uri_id = 0)
 	{
-		Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $inbox, Logger::DEBUG);
+		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])) {
+				$item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
+				Post\DeliveryData::incrementQueueFailed($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($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) {
@@ -61,16 +74,37 @@ 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);
 			}
 		}
 
+		$gsid = null;
+
+		foreach ($receivers as $receiver) {
+			$contact = Contact::getById($receiver);
+			if (empty($contact)) {
+				continue;
+			}
+
+			$gsid = $gsid ?: $contact['gsid'];
+
+			if ($success) {
+				Contact::unmarkForArchival($contact);
+			} else {
+				Contact::markForArchival($contact);
+			}
+		}
+
+		if (!empty($gsid)) {
+			GServer::setProtocol($gsid, Post\DeliveryData::ACTIVITYPUB);
+		}
+
 		if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
-			ItemDeliveryData::incrementQueueFailed($target_id);
+			Post\DeliveryData::incrementQueueFailed($uri_id);
 		} elseif ($success && in_array($cmd, [Delivery::POST])) {
-			ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::ACTIVITYPUB);
+			Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
 		}
 	}
 }