X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FAPDelivery.php;h=203c4097612d97fd04812d0dae80c8c57c50bfb3;hb=9fbdcb5459e4acb158961427837612999253e046;hp=609bb88886632b128eac4282db661eaabd9fa6e6;hpb=84e3892955c9b3a330dbfc71bf53c8932e36e570;p=friendica.git

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 609bb88886..203c409761 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,58 +23,63 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
-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  $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);
-
-		$success = true;
-
-		if ($cmd == Delivery::MAIL) {
-			$data = ActivityPub\Transmitter::createActivityFromMail($target_id);
-			if (!empty($data)) {
-				$success = HTTPSignature::transmit($data, $inbox, $uid);
+		if (ActivityPub\Transmitter::archivedInbox($inbox)) {
+			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;
 			}
-		} 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);
-		} else {
-			$data = ActivityPub\Transmitter::createCachedActivityFromItem($target_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];
+			}
+
+			foreach ($uri_ids as $uri_id) {
+				Post\Delivery::remove($uri_id, $inbox);
+				Post\DeliveryData::incrementQueueFailed($uri_id);
 			}
+			return;
 		}
 
-		// This should never fail and is temporariy (until the move to )
-		$item = Item::selectFirst(['uri-id'], ['id' => $target_id]);
+		Logger::debug('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
 
-		if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
-			Post\DeliveryData::incrementQueueFailed($item['uri-id']);
-		} elseif ($success && in_array($cmd, [Delivery::POST])) {
-			Post\DeliveryData::incrementQueueDone($item['uri-id'], Post\DeliveryData::ACTIVITYPUB);
+		if (empty($uri_id)) {
+			$result  = ActivityPub\Delivery::deliver($inbox);
+			$success = $result['success'];
+			$drop    = false;
+			$uri_ids = $result['uri_ids'];
+		} else {
+			$result  = ActivityPub\Delivery::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
+			$success = $result['success'];
+			$drop    = $result['drop'];
+			$uri_ids = [$uri_id];
+		}
+
+		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);
+			}
 		}
 	}
 }