Merge pull request #10082 from annando/deletions

Deletions are now done via DFRN as well
This commit is contained in:
Hypolite Petovan 2021-03-26 16:33:58 -04:00 committed by GitHub
commit 4b973de8cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -519,7 +519,9 @@ class Notifier
$contact['network'] = Protocol::DFRN;
}
if (in_array($contact['id'], $ap_contacts)) {
// Deletions are always sent via DFRN as well.
// This is done until we can perform deletions of foreign comments on our own threads via AP.
if (($cmd != Delivery::DELETION) && in_array($contact['id'], $ap_contacts)) {
Logger::info('Contact is already delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['target' => $post_uriid, 'uid' => $sender_uid, 'contact' => $contact['url']]);
continue;
}