X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FAPDelivery.php;h=37b47dd46dfd2c202815b24592fa918ca635e69b;hb=60532ee7e4152af9997e0d7b69c7b35262d5528d;hp=812db57013c7154d5a519d63be342b206f5e503a;hpb=08b6f55a89ffa0d1c83290da9dd7fb1f59566f11;p=friendica.git diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php index 812db57013..37b47dd46d 100644 --- a/src/Worker/APDelivery.php +++ b/src/Worker/APDelivery.php @@ -1,41 +1,137 @@ . + * */ + namespace Friendica\Worker; -use Friendica\BaseObject; use Friendica\Core\Logger; use Friendica\Core\Worker; -use Friendica\Model\ItemDeliveryData; +use Friendica\Model\Contact; +use Friendica\Model\GServer; +use Friendica\Model\Item; +use Friendica\Model\Post; use Friendica\Protocol\ActivityPub; use Friendica\Util\HTTPSignature; -class APDelivery extends BaseObject +class APDelivery { /** - * @brief Delivers ActivityPub messages + * 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]); + + 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; 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) { @@ -45,16 +141,43 @@ class APDelivery extends BaseObject } 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); + if ($success && $uri_id) { + Post\Delivery::remove($uri_id, $inbox); + } } } - if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) { - ItemDeliveryData::incrementQueueFailed($target_id); - } elseif ($success && in_array($cmd, [Delivery::POST])) { - ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::ACTIVITYPUB); + 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); + 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); } } }