use Friendica\Core\Logger;
use Friendica\Core\Worker;
-use Friendica\Model\ItemDeliveryData;
+use Friendica\Model\Item;
+use Friendica\Model\Post;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\HTTPSignature;
*/
public static function execute($cmd, $target_id, $inbox, $uid)
{
- 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' => $target_id, 'uid' => $uid]);
+ if (in_array($cmd, [Delivery::POST])) {
+ $item = Item::selectFirst(['uri-id'], ['id' => $target_id]);
+ Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? 0);
+ }
+ return;
+ }
+
+ Logger::info('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $target_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' => $target_id]);
+ $uriid = $item['uri-id'] ?? 0;
+
if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
- ItemDeliveryData::incrementQueueFailed($target_id);
+ Post\DeliveryData::incrementQueueFailed($uriid);
} elseif ($success && in_array($cmd, [Delivery::POST])) {
- ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::ACTIVITYPUB);
+ Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB);
}
}
}