Merge pull request #10082 from annando/deletions
Deletions are now done via DFRN as well
This commit is contained in:
commit
4b973de8cd
|
@ -519,7 +519,9 @@ class Notifier
|
||||||
$contact['network'] = Protocol::DFRN;
|
$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']]);
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue