Merge pull request #10190 from annando/api-attached

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 99b6a5ec036b5543f13252e9ee601a95d681d7d8..60a5572ca5035c09a634d7676a03b97c42d9d59a 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -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;
                        }