Use a better query to fetch the relay actor

diff --git a/src/Protocol/ActivityPub/Delivery.php b/src/Protocol/ActivityPub/Delivery.php
index c959d8c615bd2f6058888ff1f4e631627cfd0b82..966f0e5e16880fb089047f7b09b914dd66bb58b1 100644 (file)
--- a/src/Protocol/ActivityPub/Delivery.php
+++ b/src/Protocol/ActivityPub/Delivery.php
@@ -179,7 +179,8 @@ class Delivery
         */
        private static function fetchActorForRelayInbox(string $inbox): string
        {
-               $apcontact = DBA::selectFirst('apcontact', ['url'], ['sharedinbox' => $inbox, 'type' => 'Application']);
+               $apcontact = DBA::selectFirst('apcontact', ['url'], ["`sharedinbox` = ? AND `type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
+                       $inbox, 'Application', 0, Contact::FRIEND]);
                return $apcontact['url'] ?? '';
        }