<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Core\Logger;
use Friendica\Core\Worker;
use Friendica\Model\Contact;
-use Friendica\Model\Item;
+use Friendica\Model\GServer;
use Friendica\Model\Post;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\HTTPSignature;
* @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]);
$success = true;
}
}
- // 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;
+ $gsid = null;
foreach ($receivers as $receiver) {
$contact = Contact::getById($receiver);
continue;
}
+ $gsid = $gsid ?: $contact['gsid'];
+
if ($success) {
Contact::unmarkForArchival($contact);
} else {
}
}
+ if (!empty($gsid)) {
+ GServer::setProtocol($gsid, Post\DeliveryData::ACTIVITYPUB);
+ }
+
if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
- Post\DeliveryData::incrementQueueFailed($uriid);
+ Post\DeliveryData::incrementQueueFailed($uri_id);
} elseif ($success && in_array($cmd, [Delivery::POST])) {
- Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB);
+ Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
}
}
}