From 76789acacec5f3c6d75206d5ef437c9a6e61706e Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 2 May 2022 14:35:57 +0000 Subject: [PATCH] Reduce network request by transmitting to shared inboxes --- src/Worker/Notifier.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index fdec949a71..5ec35a656b 100644 --- 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);