clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't look at the command when archiving an inbox

This commit is contained in:
Michael Vogel 2022-05-13 04:24:22 +02:00
parent 2595b5e12f
commit 201610dfe6
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Worker/APDelivery.php
View File

@ -48,22 +48,20 @@ class APDelivery
{ {
if (ActivityPub\Transmitter::archivedInbox($inbox)) { if (ActivityPub\Transmitter::archivedInbox($inbox)) {
Logger::info('Inbox is archived', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_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])) { if (empty($uri_id) && !empty($item_id)) {
if (empty($uri_id) && !empty($item_id)) { $item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
$item = Post::selectFirst(['uri-id'], ['id' => $item_id]); $uri_id = $item['uri-id'] ?? 0;
$uri_id = $item['uri-id'] ?? 0; }
} if (empty($uri_id)) {
if (empty($uri_id)) { $posts = Post\Delivery::selectForInbox($inbox);
$posts = Post\Delivery::selectForInbox($inbox); $uri_ids = array_column($posts, 'uri-id');
$uri_ids = array_column($posts, 'uri-id'); } else {
} else { $uri_ids = [$uri_id];
$uri_ids = [$uri_id]; }
}
foreach ($uri_ids as $uri_id) {
foreach ($uri_ids as $uri_id) { Post\Delivery::remove($uri_id, $inbox);
Post\Delivery::remove($uri_id, $inbox); Post\DeliveryData::incrementQueueFailed($uri_id);
Post\DeliveryData::incrementQueueFailed($uri_id);
}
} }
return; return;
} }
@ -79,7 +77,7 @@ class APDelivery
$uri_ids = [$uri_id]; $uri_ids = [$uri_id];
} }
if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) { if (!$success && !Worker::defer() && !empty($uri_ids)) {
foreach ($uri_ids as $uri_id) { foreach ($uri_ids as $uri_id) {
Post\Delivery::remove($uri_id, $inbox); Post\Delivery::remove($uri_id, $inbox);
Post\DeliveryData::incrementQueueFailed($uri_id); Post\DeliveryData::incrementQueueFailed($uri_id);