X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FAPDelivery.php;h=b16ad7705f8a00af02f2b403392ebb2bbd187ae1;hb=97456ff20542b2dffabae77a2bab6428c51ac218;hp=051bde0a0ce9bdea0c26f30d794cc4e4ef64bc4f;hpb=f0bfa9a6901dfbdcd0383657a1cbac00a47991aa;p=friendica.git

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 051bde0a0c..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\DI;
-use Friendica\Model\Contact;
-use Friendica\Model\GServer;
 use Friendica\Model\Post;
+use Friendica\Model\User;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Util\HTTPSignature;
-
 class APDelivery
 {
 	/**
@@ -69,147 +65,29 @@ class APDelivery
 		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 {
-			$result  = 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() && !empty($uri_ids)) {
+		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):array
-	{
-		$uri_ids    = [];
-		$posts      = Post\Delivery::selectForInbox($inbox);
-		$serverfail = false;
-
-		foreach ($posts as $post) {
-			if (!$serverfail) {
-				$result = self::deliverToInbox($post['command'], 0, $inbox, $post['uid'], $post['receivers'], $post['uri-id']);
-
-				if ($result['serverfailure']) {
-					// In a timeout situation we assume that every delivery to that inbox will time out.
-					// So we set the flag and try all deliveries at a later time.
-					Logger::info('Inbox delivery has a server failure', ['inbox' => $inbox]);
-					$serverfail = true;
-				}
-			}
-
-			if ($serverfail || !$result['success']) {
-				$uri_ids[] = $post['uri-id'];
-			}
-		}
-
-		Logger::debug('Inbox delivery done', ['inbox' => $inbox, 'posts' => count($posts), 'failed' => count($uri_ids), 'serverfailure' => $serverfail]);
-		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): array
-	{
-		if (empty($item_id) && !empty($uri_id) && !empty($uid)) {
-			$item = Post::selectFirst(['id', 'parent', 'origin'], ['uri-id' => $uri_id, 'uid' => [$uid, 0]], ['order' => ['uid' => true]]);
-			if (empty($item['id'])) {
-				Logger::notice('Item not found, removing delivery', ['uri-id' => $uri_id, 'uid' => $uid, 'cmd' => $cmd, 'inbox' => $inbox]);
-				Post\Delivery::remove($uri_id, $inbox);
-				return true;
-			} else {
-				$item_id = $item['id'];
-			}
-		}
-
-		$success    = true;
-		$serverfail = false;
-
-		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)) {
-				$timestamp  = microtime(true);
-				$response   = HTTPSignature::post($data, $inbox, $uid);
-				$runtime    = microtime(true) - $timestamp;
-				$success    = $response->isSuccess();
-				$serverfail = $response->isTimeout();
-				if (!$success) {
-					if (!$serverfail && ($response->getReturnCode() >= 500) && ($response->getReturnCode() <= 599)) {
-						$serverfail = true;
-					}
-
-					$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-					if (!$serverfail && $xrd_timeout && ($runtime > $xrd_timeout)) {
-						$serverfail = true;
-					}
-					$curl_timeout = DI::config()->get('system', 'curl_timeout');
-					if (!$serverfail && $curl_timeout && ($runtime > $curl_timeout)) {
-						$serverfail = true;
-					}
-
-					Logger::info('Delivery failed', ['retcode' => $response->getReturnCode(), 'serverfailure' => $serverfail, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
-				}
-				if ($uri_id) {
-					if ($success) {
-						Post\Delivery::remove($uri_id, $inbox);
-					} else {
-						Post\Delivery::incrementFailed($uri_id, $inbox);
-					}
-				}
-			}
-		}
-
-		self::setSuccess($receivers, $success);
-
-		Logger::debug('Delivered', ['uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox, 'success' => $success]);
-
-		if ($success && in_array($cmd, [Delivery::POST])) {
-			Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
-		}
-
-		return ['success' => $success, 'serverfailure' => $serverfail];
-	}
-
-	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);
-		}
-	}
 }