Merge pull request #11902 from annando/duplicates

Detect and remove contact duplicates
This commit is contained in:
Hypolite Petovan 2022-09-21 21:23:37 -04:00 committed by GitHub
commit 6a9d91c824
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 281 additions and 60 deletions

View file

@ -84,7 +84,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'];
}