From 2049fbce91c66e8aeb561cb578fb9f9374443d4b Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 13 May 2022 02:11:02 +0000 Subject: [PATCH] Remove delivery when the inbox is archived --- src/Worker/APDelivery.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php index b3667d653c..1ec0ba47ce 100644 --- a/src/Worker/APDelivery.php +++ b/src/Worker/APDelivery.php @@ -47,10 +47,14 @@ 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]); + Logger::info('Inbox is archived', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]); if (in_array($cmd, [Delivery::POST])) { - $item = Post::selectFirst(['uri-id'], ['id' => $item_id]); - Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? 0); + if (empty($uri_id)) { + $item = Post::selectFirst(['uri-id'], ['id' => $item_id]); + $uri_id = $item['uri-id'] ?? 0; + } + Post\Delivery::remove($uri_id, $inbox); + Post\DeliveryData::incrementQueueFailed($uri_id); } return; }