X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FAPDelivery.php;h=b16ad7705f8a00af02f2b403392ebb2bbd187ae1;hb=b9bb525fe91c176ada2323c2d628291a27594d59;hp=caf89781e524025e5f233335c105850f9d77f0cd;hpb=b0b67f1fde8658aefb1f4152894f381ae7f3a871;p=friendica.git

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index caf89781e5..b16ad7705f 100644
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,13 +23,9 @@ 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\Model\User;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Util\HTTPSignature;
-
 class APDelivery
 {
 	/**
@@ -47,131 +43,51 @@ class APDelivery
 	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])) {
+			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]);
-				Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? 0);
+				$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' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
+		Logger::debug('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
 
 		if (empty($uri_id)) {
-			$result = self::deliver($inbox);
+			$result  = ActivityPub\Delivery::deliver($inbox);
 			$success = $result['success'];
+			$drop    = false;
 			$uri_ids = $result['uri_ids'];
 		} else {
-			$success = self::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
+			$owner = User::getOwnerDataById($uid);
+			if (!$owner) {
+				Post\Delivery::remove($uri_id, $inbox);
+				Post\Delivery::incrementFailed($uri_id, $inbox);
+				return;
+			}
+
+			$result  = ActivityPub\Delivery::deliverToInbox($cmd, $item_id, $inbox, $owner, $receivers, $uri_id);
+			$success = $result['success'];
+			$drop    = $result['drop'];
 			$uri_ids = [$uri_id];
 		}
 
-		if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
+		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);
 			}
 		}
 	}
-
-	private static function deliver(string $inbox)
-	{
-		Post\Delivery::removeFailed($inbox);
-		
-		$uri_ids = [];
-		$posts   = Post\Delivery::selectForInbox($inbox);
-
-		foreach ($posts as $post) {
-			if (!self::deliverToInbox($post['command'], 0, $inbox, $post['uid'], [], $post['uri-id'])) {
-				$uri_ids[] = $post['uri-id'];
-			}
-		}
-
-		return ['success' => empty($uri_ids), '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;
-
-		if ($cmd == Delivery::MAIL) {
-			$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, $item_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($item_id);
-			if (!empty($data)) {
-				$success = HTTPSignature::transmit($data, $inbox, $uid);
-				if ($uri_id) {
-					if ($success) {
-						Post\Delivery::remove($uri_id, $inbox);
-					} else {
-						Post\Delivery::incrementFailed($uri_id, $inbox);
-					}
-				}
-			}
-		}
-
-		self::setSuccess($receivers, $success);
-
-		Logger::info('Delivered', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid, 'success' => $success]);
-
-		if ($success && in_array($cmd, [Delivery::POST])) {
-			Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
-		}
-
-		return $success;
-	}
-
-	private static function setSuccess(array $receivers, bool $success)
-	{
-		$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);
-		}
-	}
 }