Merge pull request #13724 from Raroun/Fix-for-Issue-#13637---Photo-caption-prevents...

[friendica.git] / src / Protocol / ActivityPub / Transmitter.php

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 83155bf4f103abdd0aaff33e8c9c7adfe86bfa7c..c15ee42dfe33248a31556562d0153940622b7e47 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -368,7 +368,8 @@ class Transmitter
                        $data['outbox']    = DI::baseUrl() . '/outbox/' . $owner['nick'];
                        $data['featured']  = DI::baseUrl() . '/featured/' . $owner['nick'];
                } else {
-                       $data['inbox'] = DI::baseUrl() . '/friendica/inbox';
+                       $data['inbox']  = DI::baseUrl() . '/friendica/inbox';
+                       $data['outbox'] = DI::baseUrl() . '/friendica/outbox';
                }
 
                $data['preferredUsername'] = $owner['nick'];
@@ -1121,19 +1122,17 @@ class Transmitter
         */
        public static function fetchTargetInboxesFromMail(int $mail_id): array
        {
-               $mail = DBA::selectFirst('mail', ['uid', 'parent-uri', 'from-url'], ['id' => $mail_id]);
+               $mail = DBA::selectFirst('mail', ['contact-id'], ['id' => $mail_id]);
                if (!DBA::isResult($mail)) {
                        return [];
                }
 
-               $reply = DBA::selectFirst('mail', ['from-url'], ['parent-uri' => $mail['parent-uri'], 'reply' => false]);
-               if (!DBA::isResult($reply)) {
-                       $reply = $mail;
+               $account = DBA::selectFirst('account-user-view', ['ap-inbox'], ['id' => $mail['contact-id']]);
+               if (empty($account['ap-inbox'])) {
+                       return [];
                }
 
-               $apcontact = APContact::getByURL($reply['from-url'], false);
-
-               return [$apcontact['inbox'] => [Contact::getIdForURL($reply['from-url'])]];
+               return [$account['ap-inbox'] => [$mail['contact-id']]];
        }
 
        /**