keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support dropping delivery for single message transfer as well

Browse source
This commit is contained in:
Michael 2022-05-24 12:32:04 +00:00
parent 034d838248
commit bee6ffe968
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Worker/APDelivery.php
View file

@ -66,14 +66,16 @@ class APDelivery
if (empty($uri_id)) { if (empty($uri_id)) {
$result = ActivityPub\Delivery::deliver($inbox); $result = ActivityPub\Delivery::deliver($inbox);
$success = $result['success']; $success = $result['success'];
$drop = false;
$uri_ids = $result['uri_ids']; $uri_ids = $result['uri_ids'];
} else { } else {
$result = ActivityPub\Delivery::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id); $result = ActivityPub\Delivery::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
$success = $result['success']; $success = $result['success'];
$drop = $result['drop'];
$uri_ids = [$uri_id]; $uri_ids = [$uri_id];
} }
if (!$success && !Worker::defer() && !empty($uri_ids)) { if (!$drop && !$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);