New option to disable the fetching of parents

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index e248c944dd39d7faedf94f177aacef3e5e1d96b3..843d50ca059cded968b1b420c854c584dd2a2396 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -81,7 +81,7 @@ class Notifier
                        $uid = $message['uid'];
                        $recipients[] = $message['contact-id'];
 
-                       $mail = ActivityPub\Transmitter::ItemArrayFromMail($target_id);
+                       $mail = ActivityPub\Transmitter::getItemArrayFromMail($target_id);
                        $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($mail, $uid, true);
                        foreach ($inboxes as $inbox => $receivers) {
                                $ap_contacts = array_merge($ap_contacts, $receivers);
@@ -505,9 +505,17 @@ class Notifier
                foreach ($contacts as $contact) {
                        // Direct delivery of local contacts
                        if (!in_array($cmd, [Delivery::RELOCATION, Delivery::SUGGESTION, Delivery::DELETION, Delivery::MAIL]) && $target_uid = User::getIdForURL($contact['url'])) {
-                               Logger::info('Direct delivery', ['uri-id' => $target_item['uri-id'], 'target' => $target_uid]);
-                               $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH];
-                               Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
+                               if ($target_item['origin'] || ($target_item['network'] != Protocol::ACTIVITYPUB)) {
+                                       if ($target_uid != $target_item['uid']) {
+                                               $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_DIRECT];
+                                               Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
+                                               Logger::info('Delivered locally', ['cmd' => $cmd, 'id' => $target_item['id'], 'target' => $target_uid]);
+                                       } else {
+                                               Logger::info('No need to deliver to myself', ['uid' => $target_uid, 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                                       }
+                               } else {
+                                       Logger::info('Remote item does not need to be delivered locally', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                               }
                                continue;
                        }
 
@@ -746,7 +754,7 @@ class Notifier
                        }
 
                        Logger::info('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.');
-               } elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) {
+               } elseif (!Post\Activity::exists($target_item['uri-id'])) {
                        Logger::info('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.');
                        return ['count' => 0, 'contacts' => []];
                } elseif ($parent['origin']) {
@@ -754,7 +762,6 @@ class Notifier
 
                        if (in_array($target_item['private'], [Item::PUBLIC])) {
                                $inboxes = ActivityPub\Transmitter::addRelayServerInboxesForItem($parent['id'], $inboxes);
-                               $relay_inboxes = ActivityPub\Transmitter::addRelayServerInboxes([]);
                        }
 
                        Logger::info('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.');
@@ -776,12 +783,22 @@ class Notifier
 
                        if ((count($receivers) == 1) && Network::isLocalLink($inbox)) {
                                $contact = Contact::getById($receivers[0], ['url']);
-                               if ($target_uid = User::getIdForURL($contact['url'])) {
-                                       $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_BCC];
-                                       Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
-                                       Logger::info('Delivered locally', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
+                               if (!in_array($cmd, [Delivery::RELOCATION, Delivery::SUGGESTION, Delivery::DELETION, Delivery::MAIL]) && ($target_uid = User::getIdForURL($contact['url']))) {
+                                       if ($target_item['origin'] || ($target_item['network'] != Protocol::ACTIVITYPUB)) {
+                                               if ($target_uid != $target_item['uid']) {
+                                                       $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_BCC];
+                                                       Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
+                                                       Logger::info('Delivered locally', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
+                                               } else {
+                                                       Logger::info('No need to deliver to myself', ['uid' => $target_uid, 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                                               }
+                                       } else {
+                                               Logger::info('Remote item does not need to be delivered locally', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
+                                       }
                                        continue;
                                }
+                       } elseif ((count($receivers) >= 1) && Network::isLocalLink($inbox)) {
+                               Logger::info('Is this a thing?', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
                        }
 
                        Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);