Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 14:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2022.09-rc' into cooldown

Browse source
This commit is contained in:
Michael 2022-09-22 04:31:50 +00:00
commit 4939be065e
15 changed files with 281 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/ActivityPub/Delivery.php
View file

@ -86,7 +86,7 @@ class Delivery
if (empty($item['id'])) {
Logger::warning('Item not found, removing delivery', ['uri-id' => $uri_id, 'uid' => $uid, 'cmd' => $cmd, 'inbox' => $inbox]);
Post\Delivery::remove($uri_id, $inbox);
return true;
return ['success' => true, 'serverfailure' => false, 'drop' => false];
} else {
$item_id = $item['id'];
}