X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FAPDelivery.php;h=37b47dd46dfd2c202815b24592fa918ca635e69b;hb=60532ee7e4152af9997e0d7b69c7b35262d5528d;hp=0c2c0ca9c487c59aa775418c0f102344adc58dd7;hpb=1414d43597b89817acc76787b502eaeb58e4876d;p=friendica.git

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 0c2c0ca9c4..37b47dd46d 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
  *
@@ -24,6 +24,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Model\Contact;
+use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
@@ -39,21 +40,88 @@ class APDelivery
 	 * @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(string $cmd, int $item_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' => $item_id, 'uid' => $uid]);
 			if (in_array($cmd, [Delivery::POST])) {
-				$item = Item::selectFirst(['uri-id'], ['id' => $item_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' => $item_id, 'uid' => $uid]);
+		Logger::info('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
+
+		if (empty($uri_id)) {
+			$result = self::deliver($inbox);
+			$success = $result['success'];
+			$uri_ids = $result['uri_ids'];
+		}
+
+		if (empty($uri_ids)) {
+			$success = self::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
+		}
+
+		if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
+			if (!empty($uri_id)) {
+				Post\Delivery::remove($uri_id, $inbox);
+				Post\DeliveryData::incrementQueueFailed($uri_id);
+			} elseif (!empty($uri_ids)) {
+				foreach ($uri_ids as $uri_id) {
+					Post\Delivery::remove($uri_id, $inbox);
+					Post\DeliveryData::incrementQueueFailed($uri_id);
+				}
+			}
+		} elseif ($success && in_array($cmd, [Delivery::POST])) {
+			if (!empty($uri_id)) {
+				Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
+			} elseif (!empty($uri_ids)) {
+				foreach ($uri_ids as $uri_id) {
+					Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
+				}
+			}
+		}
+	}
+
+	private static function deliver(string $inbox)
+	{
+		$uri_ids = [];
+		$success = true;
+
+		$posts = Post\Delivery::selectForInbox($inbox);
+		foreach ($posts as $post) {
+			$uri_ids[] = $post['uri-id'];
+			if ($success) {
+				$success = self::deliverToInbox($post['command'], 0, $inbox, $post['uid'], [], $post['uri-id']);
+			}
+		}
+
+		return ['success' => $success, 'uri_ids' => $uri_ids];
+	}
+
+	private static function deliverToInbox(string $cmd, int $item_id, string $inbox, int $uid, array $receivers, int $uri_id)
+	{
+		if (empty($item_id) && !empty($uri_id) && !empty($uid)) {
+			$item = Post::selectFirst(['id', 'parent', 'origin'], ['uri-id' => $uri_id, 'uid' => $uid]);
+			$item_id = $item['id'] ?? 0;
+			if (empty($receivers) && !empty($item)) {
+				$parent = Post::selectFirst(Item::DELIVER_FIELDLIST, ['id' => $item['parent']]);
+
+				$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid);
+				$receivers = $inboxes[$inbox] ?? [];
+
+				// When we haven't fetched the receiver list, it can be a personal inbox
+				if (empty($receivers)) {
+					$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid, true);
+					$receivers = $inboxes[$inbox] ?? [];
+				}					
+			}
+		}
 
 		$success = true;
 
@@ -76,12 +144,22 @@ class APDelivery
 			$data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id);
 			if (!empty($data)) {
 				$success = HTTPSignature::transmit($data, $inbox, $uid);
+				if ($success && $uri_id) {
+					Post\Delivery::remove($uri_id, $inbox);
+				}
 			}
 		}
 
-		// This should never fail and is temporariy (until the move to the "post" structure)
-		$item = Item::selectFirst(['uri-id'], ['id' => $item_id]);
-		$uriid = $item['uri-id'] ?? 0;
+		self::setSuccess($receivers, $success);
+
+		Logger::info('Delivered', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid, 'success' => $success]);
+
+		return $success;
+	}
+
+	private static function setSuccess(array $receivers, bool $success)
+	{
+		$gsid = null;
 
 		foreach ($receivers as $receiver) {
 			$contact = Contact::getById($receiver);
@@ -89,6 +167,8 @@ class APDelivery
 				continue;
 			}
 
+			$gsid = $gsid ?: $contact['gsid'];
+
 			if ($success) {
 				Contact::unmarkForArchival($contact);
 			} else {
@@ -96,10 +176,8 @@ class APDelivery
 			}
 		}
 
-		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);
+		if (!empty($gsid)) {
+			GServer::setProtocol($gsid, Post\DeliveryData::ACTIVITYPUB);
 		}
 	}
 }