Reduce network request by transmitting to shared inboxes

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index fdec949a71b2df3507268f5b822246375c4797d0..5ec35a656b0b4db8dc84d82c67849ff721561d0d 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -677,7 +677,7 @@ class Notifier
                }
                DBA::close($contacts_stmt);
 
-               $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0);
+               $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser($self_user_id);
                foreach ($inboxes as $inbox => $receivers) {
                        Logger::info('Account removal via ActivityPub', ['uid' => $self_user_id, 'inbox' => $inbox]);
                        Worker::add(['priority' => PRIORITY_NEGLIGIBLE, 'created' => $created, 'dont_fork' => true],
@@ -750,9 +750,7 @@ class Notifier
                        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']) {
-                       // Remote items are transmitted via the personal inboxes.
-                       // Doing so ensures that the dedicated receiver will get the message.
-                       $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid, true, $target_item['id']);
+                       $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid, false, $target_item['id']);
 
                        if (in_array($target_item['private'], [Item::PUBLIC])) {
                                $inboxes = ActivityPub\Transmitter::addRelayServerInboxesForItem($parent['id'], $inboxes);