From: Michael <heluecht@pirati.ca>
Date: Fri, 26 Mar 2021 20:09:23 +0000 (+0000)
Subject: Comment deletions are always send via DFRN
X-Git-Tag: 2021.04~54^2
X-Git-Url: https://reisub.nsupdate.info/git/?a=commitdiff_plain;h=24099c343930a59249700546ad47a2f81d22a57f;p=friendica.git%2F.git

Comment deletions are always send via DFRN
---

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 99b6a5ec03..e1f5d6be5c 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -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;
 			}