Merge pull request #8820 from annando/fix-author-network

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 34a4cdc023f37c825690a7b0822f5e2dae6b6e7d..8bcc0d3e35ad98f9db406f8d24dd435354c121bd 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -166,7 +166,7 @@ class Notifier
                if (!empty($target_item) && !empty($items)) {
                        $parent = $items[0];
 
-                       $fields = ['network', 'author-id', 'author-link', 'owner-id'];
+                       $fields = ['network', 'author-id', 'author-link', 'author-network', 'owner-id'];
                        $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
                        $thr_parent = Item::selectFirst($fields, $condition);
                        if (empty($thr_parent)) {
@@ -437,7 +437,7 @@ class Notifier
 
                                // Fetch the participation list
                                // The function will ensure that there are no duplicates
-                               $relay_list = Diaspora::participantsForThread($parent, $relay_list);
+                               $relay_list = Diaspora::participantsForThread($target_item, $relay_list);
 
                                // Add the relay to the list, avoid duplicates.
                                // Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly.
@@ -461,17 +461,17 @@ class Notifier
                                        }
 
                                        if (!empty($rr['addr']) && ($rr['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $rr['addr']])) {
-                                               Logger::info('Contact is AP omly', ['target' => $target_id, 'contact' => $rr['url']]);
+                                               Logger::info('Contact is AP omly, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'contact' => $rr['url']]);
                                                continue;
                                        }
 
                                        if (!empty($rr['id']) && Contact::isArchived($rr['id'])) {
-                                               Logger::info('Contact is archived', ['target' => $target_id, 'contact' => $rr['url']]);
+                                               Logger::info('Contact is archived, so skip delivery', ['target' => $target_id, 'contact' => $rr['url']]);
                                                continue;
                                        }
 
                                        if (self::isRemovalActivity($cmd, $owner, $rr['network'])) {
-                                               Logger::log('Skipping dropping for ' . $rr['url'] . ' since the network supports account removal commands.', Logger::DEBUG);
+                                               Logger::info('Contact does no supports account removal commands, so skip delivery', ['target' => $target_id, 'contact' => $rr['url']]);
                                                continue;
                                        }
 
@@ -480,6 +480,11 @@ class Notifier
                                                continue;
                                        }
 
+                                       if (self::skipActivityPubForDiaspora($rr, $target_item, $thr_parent)) {
+                                               Logger::info('Contact is from Diaspora, but the replied author is from ActivityPub, so skip delivery via Diaspora', ['id' => $target_id, 'url' => $rr['url']]);
+                                               continue;
+                                       }
+
                                        $conversants[] = $rr['id'];
 
                                        Logger::info('Public delivery', ['target' => $target_id, 'guid' => $target_item["guid"], 'to' => $rr]);
@@ -511,17 +516,17 @@ class Notifier
                        }
 
                        if (!empty($contact['addr']) && ($contact['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $contact['addr']])) {
-                               Logger::info('Contact is AP omly', ['target' => $target_id, 'contact' => $contact['url']]);
+                               Logger::info('Contact is AP omly, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'contact' => $contact['url']]);
                                continue;
                        }
 
                        if (!empty($contact['id']) && Contact::isArchived($contact['id'])) {
-                               Logger::info('Contact is archived', ['target' => $target_id, 'contact' => $contact['url']]);
+                               Logger::info('Contact is archived, so skip delivery', ['target' => $target_id, 'contact' => $contact['url']]);
                                continue;
                        }
 
                        if (self::isRemovalActivity($cmd, $owner, $contact['network'])) {
-                               Logger::log('Skipping dropping for ' . $contact['url'] . ' since the network supports account removal commands.', Logger::DEBUG);
+                               Logger::info('Contact does no supports account removal commands, so skip delivery', ['target' => $target_id, 'contact' => $contact['url']]);
                                continue;
                        }
 
@@ -530,6 +535,11 @@ class Notifier
                                continue;
                        }
 
+                       if (self::skipActivityPubForDiaspora($contact, $target_item, $thr_parent)) {
+                               Logger::info('Contact is from Diaspora, but the replied author is from ActivityPub, so skip delivery via Diaspora', ['id' => $target_id, 'url' => $rr['url']]);
+                               continue;
+                       }
+
                        // Don't deliver to Diaspora if it already had been done as batch delivery
                        if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) {
                                Logger::log('Already delivered  id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG);
@@ -602,6 +612,35 @@ class Notifier
                return;
        }
 
+       /**
+        * Checks if the current delivery shouldn't be transported to Diaspora.
+        * This is done for posts from AP authors or posts that are comments to AP authors.
+        *
+        * @param array  $contact    Receiver of the post
+        * @param array  $item       The post
+        * @param array  $thr_parent The thread parent
+        * @return bool
+        */
+       private static function skipActivityPubForDiaspora(array $contact, array $item, array $thr_parent)
+       {
+               // No skipping needs to be done when delivery isn't done to Diaspora
+               if ($contact['network'] != Protocol::DIASPORA) {
+                       return false;
+               }
+
+               // Skip the delivery to Diaspora if the item is from an ActivityPub author
+               if ($item['author-network'] == Protocol::ACTIVITYPUB) {
+                       return true;
+               }
+               
+               // Skip the delivery to Diaspora if the thread parent is from an ActivityPub author
+               if ($thr_parent['author-network'] == Protocol::ACTIVITYPUB) {
+                       return true;
+               }
+
+               return false;
+       }
+
        /**
         * Checks if the current delivery process needs to be transported via DFRN.
         *