]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/ActivityPub/Receiver.php
Merge remote-tracking branch 'upstream/2023.05-rc' into quote-loop
[friendica.git] / src / Protocol / ActivityPub / Receiver.php
index fbe8c32dc70fe8624c6f408a0e5782aa18cfff96..db4196abc4a5e85de0b3b00253e0b8f885c224b8 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -73,12 +73,13 @@ class Receiver
        const TARGET_FOLLOWER = 5;
        const TARGET_ANSWER = 6;
        const TARGET_GLOBAL = 7;
+       const TARGET_AUDIENCE = 8;
 
-       const COMPLETION_NONE    = 0;
-       const COMPLETION_ANNOUCE = 1;
-       const COMPLETION_RELAY   = 2;
-       const COMPLETION_MANUAL  = 3;
-       const COMPLETION_AUTO    = 4;
+       const COMPLETION_NONE     = 0;
+       const COMPLETION_ANNOUNCE = 1;
+       const COMPLETION_RELAY    = 2;
+       const COMPLETION_MANUAL   = 3;
+       const COMPLETION_AUTO     = 4;
 
        /**
         * Checks incoming message from the inbox
@@ -248,14 +249,14 @@ class Receiver
         * Fetches the object type for a given object id
         *
         * @param array   $activity
-        * @param string  $object_id Object ID of the the provided object
+        * @param string  $object_id Object ID of the provided object
         * @param integer $uid       User ID
         *
         * @return string with object type or NULL
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function fetchObjectType(array $activity, string $object_id, int $uid = 0)
+       public static function fetchObjectType(array $activity, string $object_id, int $uid = 0)
        {
                if (!empty($activity['as:object'])) {
                        $object_type = JsonLD::fetchElement($activity['as:object'], '@type');
@@ -315,12 +316,15 @@ class Receiver
                        $object_type = JsonLD::fetchElement($activity['as:object'], '@type');
                }
 
+               $fetched = false;
+
                if (!empty($id) && !$trust_source) {
                        $fetch_uid = $uid ?: self::getBestUserForActivity($activity);
 
                        $fetched_activity = Processor::fetchCachedActivity($fetch_id, $fetch_uid);
                        if (!empty($fetched_activity)) {
-                               $object = JsonLD::compact($fetched_activity);
+                               $fetched = true;
+                               $object  = JsonLD::compact($fetched_activity);
 
                                $fetched_id   = JsonLD::fetchElement($object, '@id');
                                $fetched_type = JsonLD::fetchElement($object, '@type');
@@ -351,7 +355,7 @@ class Receiver
                $type = JsonLD::fetchElement($activity, '@type');
 
                // Fetch all receivers from to, cc, bto and bcc
-               $receiverdata = self::getReceivers($activity, $actor);
+               $receiverdata = self::getReceivers($activity, $actor, [], false, $push || $fetched);
                $receivers = $reception_types = [];
                foreach ($receiverdata as $key => $data) {
                        $receivers[$key] = $data['uid'];
@@ -392,15 +396,22 @@ class Receiver
 
                // Fetch the activity on Lemmy "Announce" messages (announces of activities)
                if (($type == 'as:Announce') && in_array($object_type, array_merge(self::ACTIVITY_TYPES, ['as:Delete', 'as:Undo', 'as:Update']))) {
-                       Logger::debug('Fetch announced activity', ['object' => $object_id]);
+                       Logger::debug('Fetch announced activity', ['object' => $object_id, 'uid' => $fetch_uid]);
                        $data = Processor::fetchCachedActivity($object_id, $fetch_uid);
                        if (!empty($data)) {
                                $type = $object_type;
-                               $activity = JsonLD::compact($data);
+                               $announced_activity = JsonLD::compact($data);
 
                                // Some variables need to be refetched since the activity changed
-                               $actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
-                               $object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
+                               $actor = JsonLD::fetchElement($announced_activity, 'as:actor', '@id');
+                               $announced_id = JsonLD::fetchElement($announced_activity, 'as:object', '@id');
+                               if (empty($announced_id)) {
+                                       Logger::warning('No object id in announced activity', ['id' => $object_id, 'activity' => $activity, 'announced' => $announced_activity]);
+                                       return [];
+                               } else {
+                                       $activity  = $announced_activity;
+                                       $object_id = $announced_id;
+                               }
                                $object_type = self::fetchObjectType($activity, $object_id, $fetch_uid);
                        }
                }
@@ -412,7 +423,6 @@ class Receiver
                        $object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object', '@id');
                        $object_data['object_ids'] = JsonLD::fetchElementArray($activity, 'as:object', '@id');
                        $object_data['content'] = JsonLD::fetchElement($activity, 'as:content', '@type');
-                       $object_data['push'] = $push;
                } elseif (in_array($object_type, self::ACCOUNT_TYPES)) {
                        $object_data = [];
                        $object_data['id'] = JsonLD::fetchElement($activity, '@id');
@@ -420,16 +430,14 @@ class Receiver
                        $object_data['object_actor'] = JsonLD::fetchElement($activity['as:object'], 'as:actor', '@id');
                        $object_data['object_object'] = JsonLD::fetchElement($activity['as:object'], 'as:object');
                        $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type');
-                       $object_data['push'] = $push;
                        if (!$trust_source && ($type == 'as:Delete')) {
                                $apcontact = APContact::getByURL($object_data['object_id'], true);
                                $trust_source = empty($apcontact) || ($apcontact['type'] == 'Tombstone') || $apcontact['suspended'];
                        }
-               } elseif (in_array($type, ['as:Create', 'as:Update', 'as:Announce', 'as:Invite']) || strpos($type, '#emojiReaction')) {
+               } elseif (in_array($type, ['as:Create', 'as:Update', 'as:Invite']) || strpos($type, '#emojiReaction')) {
                        // Fetch the content only on activities where this matters
                        // We can receive "#emojiReaction" when fetching content from Hubzilla systems
-                       // Always fetch on "Announce"
-                       $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source && ($type != 'as:Announce'), $fetch_uid);
+                       $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $fetch_uid);
                        if (empty($object_data)) {
                                Logger::info("Object data couldn't be processed");
                                return [];
@@ -437,19 +445,13 @@ class Receiver
 
                        $object_data['object_id'] = $object_id;
 
-                       if ($type == 'as:Announce') {
-                               $object_data['push'] = false;
-                       } else {
-                               $object_data['push'] = $push;
-                       }
-
                        // Test if it is an answer to a mail
                        if (DBA::exists('mail', ['uri' => $object_data['reply-to-id']])) {
                                $object_data['directmessage'] = true;
                        } else {
                                $object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
                        }
-               } elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
+               } elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Announce', 'as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
                        // Create a mostly empty array out of the activity data (instead of the object).
                        // This way we later don't have to check for the existence of each individual array element.
                        $object_data = self::processObject($activity);
@@ -457,7 +459,6 @@ class Receiver
                        $object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id');
                        $object_data['object_id'] = $object_id;
                        $object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
-                       $object_data['push'] = $push;
                } elseif (in_array($type, ['as:Add', 'as:Remove', 'as:Move'])) {
                        $object_data = [];
                        $object_data['id'] = JsonLD::fetchElement($activity, '@id');
@@ -465,7 +466,6 @@ class Receiver
                        $object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object', '@id');
                        $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type');
                        $object_data['object_content'] = JsonLD::fetchElement($activity['as:object'], 'as:content', '@type');
-                       $object_data['push'] = $push;
                } else {
                        $object_data = [];
                        $object_data['id'] = JsonLD::fetchElement($activity, '@id');
@@ -473,7 +473,6 @@ class Receiver
                        $object_data['object_actor'] = JsonLD::fetchElement($activity['as:object'], 'as:actor', '@id');
                        $object_data['object_object'] = JsonLD::fetchElement($activity['as:object'], 'as:object');
                        $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type');
-                       $object_data['push'] = $push;
 
                        // An Undo is done on the object of an object, so we need that type as well
                        if (($type == 'as:Undo') && !empty($object_data['object_object'])) {
@@ -488,13 +487,15 @@ class Receiver
                        }
                }
 
+               $object_data['push'] = $push;
+
                $object_data = self::addActivityFields($object_data, $activity);
 
                if (empty($object_data['object_type'])) {
                        $object_data['object_type'] = $object_type;
                }
 
-               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc', 'as:audience', 'as:attributedTo'] as $element) {
                        if ((empty($object_data['receiver_urls'][$element]) || in_array($element, ['as:bto', 'as:bcc'])) && !empty($urls[$element])) {
                                $object_data['receiver_urls'][$element] = array_unique(array_merge($object_data['receiver_urls'][$element] ?? [], $urls[$element]));
                        }
@@ -566,7 +567,7 @@ class Receiver
                        return true;
                }
 
-               if ($type == 'as:View') {
+               if (!DI::config()->get('system', 'process_view') && ($type == 'as:View')) {
                        Logger::info('View activities are ignored.', ['signer' => $signer, 'http_signer' => $http_signer]);
                        return true;
                }
@@ -637,7 +638,7 @@ class Receiver
                        $object_data['object_activity'] = $activity;
                }
 
-               if (($type == 'as:Create') && $trust_source) {
+               if (($type == 'as:Create') && $trust_source && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUNCE])) {
                        if (self::hasArrived($object_data['object_id'])) {
                                Logger::info('The activity already arrived.', ['id' => $object_data['object_id']]);
                                return true;
@@ -648,9 +649,13 @@ class Receiver
                                Logger::info('The activity is already added.', ['id' => $object_data['object_id']]);
                                return true;
                        }
+               } elseif (($type == 'as:Create') && $trust_source && !self::hasArrived($object_data['object_id'])) {
+                       self::addArrivedId($object_data['object_id']);
                }
 
-               if (DI::config()->get('system', 'decoupled_receiver') && ($trust_source || DI::config()->get('debug', 'ap_inbox_store_untrusted'))) {
+               $decouple = DI::config()->get('system', 'decoupled_receiver') && !in_array($completion, [self::COMPLETION_MANUAL, self::COMPLETION_ANNOUNCE]);
+
+               if ($decouple && ($trust_source || DI::config()->get('debug', 'ap_inbox_store_untrusted'))) {
                        $object_data = Queue::add($object_data, $type, $uid, $http_signer, $push, $trust_source);
                }
 
@@ -659,7 +664,7 @@ class Receiver
                        return true;
                }
 
-               if (!empty($object_data['entry-id']) && DI::config()->get('system', 'decoupled_receiver') && ($push || ($completion == self::COMPLETION_RELAY))) {
+               if (!empty($object_data['entry-id']) && $decouple && ($push || ($completion == self::COMPLETION_RELAY))) {
                        if (Queue::isProcessable($object_data['entry-id'])) {
                                // We delay by 5 seconds to allow to accumulate all receivers
                                $delayed = date(DateTimeFormat::MYSQL, time() + 5);
@@ -676,7 +681,7 @@ class Receiver
                        $object_data['recursion-depth'] = $activity['recursion-depth'];
                }
 
-               if (!self::routeActivities($object_data, $type, $push)) {
+               if (!self::routeActivities($object_data, $type, $push, true, $uid)) {
                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
                        Queue::remove($object_data);
                }
@@ -690,13 +695,12 @@ class Receiver
         * @param string $type
         * @param bool   $push
         * @param bool   $fetch_parents
+        * @param int    $uid
         *
         * @return boolean Could the activity be routed?
         */
-       public static function routeActivities(array $object_data, string $type, bool $push, bool $fetch_parents = true): bool
+       public static function routeActivities(array $object_data, string $type, bool $push, bool $fetch_parents = true, int $uid = 0): bool
        {
-               $activity = $object_data['object_activity']     ?? [];
-
                switch ($type) {
                        case 'as:Create':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
@@ -736,43 +740,24 @@ class Receiver
 
                        case 'as:Announce':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       $actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
-                                       $object_data['thread-completion'] = Contact::getIdForURL($actor);
-                                       $object_data['completion-mode']   = self::COMPLETION_ANNOUCE;
-
-                                       if (!Post::exists(['uri' => $object_data['id'], 'uid' => 0])) {
-                                               $item = ActivityPub\Processor::createItem($object_data, $fetch_parents);
-                                               if (empty($item)) {
-                                                       Logger::debug('announced id was not created', ['id' => $object_data['id']]);
+                                       if (!Item::searchByLink($object_data['object_id'], $uid)) {
+                                               if (ActivityPub\Processor::fetchMissingActivity($object_data['object_id'], [], $object_data['actor'], self::COMPLETION_ANNOUNCE, $uid)) {
+                                                       Logger::debug('Created announced id', ['uid' => $uid, 'id' => $object_data['object_id']]);
+                                                       Queue::remove($object_data);
+                                               } else {
+                                                       Logger::debug('Announced id was not created', ['uid' => $uid, 'id' => $object_data['object_id']]);
                                                        Queue::remove($object_data);
                                                        return true;
                                                }
-
-                                               $item['post-reason'] = Item::PR_ANNOUNCEMENT;
-                                               ActivityPub\Processor::postItem($object_data, $item);
-                                               Logger::debug('Created announced id', ['id' => $object_data['id']]);
                                        } else {
-                                               Logger::info('Announced id already exists', ['id' => $object_data['id']]);
+                                               Logger::info('Announced id already exists', ['uid' => $uid, 'id' => $object_data['object_id']]);
                                                Queue::remove($object_data);
                                        }
 
-                                       if (!empty($activity)) {
-                                               $announce_object_data = self::processObject($activity);
-                                               $announce_object_data['name'] = $type;
-                                               $announce_object_data['author'] = $actor;
-                                               $announce_object_data['object_id'] = $object_data['id'];
-                                               $announce_object_data['object_type'] = $object_data['object_type'];
-                                               $announce_object_data['push'] = $push;
-                                               Logger::debug('Create announce activity', ['id' => $announce_object_data['id'], 'object_data' => $announce_object_data]);
-
-                                               if (!empty($object_data['raw'])) {
-                                                       $announce_object_data['raw'] = $object_data['raw'];
-                                               }
-                                               if (!empty($object_data['raw-object'])) {
-                                                       $announce_object_data['raw-object'] = $object_data['raw-object'];
-                                               }
-                                               ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE);
-                                       }
+                                       ActivityPub\Processor::createActivity($object_data, Activity::ANNOUNCE);
+                               } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
+                                       // We don't have the object here or it is deleted. We ignore this activity.
+                                       Queue::remove($object_data);
                                } else {
                                        return false;
                                }
@@ -841,7 +826,7 @@ class Receiver
                                        return false;
                                }
                                break;
-       
+
                        case 'as:Block':
                                if (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
                                        ActivityPub\Processor::blockAccount($object_data);
@@ -857,7 +842,7 @@ class Receiver
                                        return false;
                                }
                                break;
-       
+
                        case 'as:Remove':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
                                        ActivityPub\Processor::removeFromFeaturedCollection($object_data);
@@ -1029,7 +1014,7 @@ class Receiver
                $uid = 0;
                $actor = JsonLD::fetchElement($activity, 'as:actor', '@id') ?? '';
 
-               $receivers = self::getReceivers($activity, $actor);
+               $receivers = self::getReceivers($activity, $actor, [], false, false);
                foreach ($receivers as $receiver) {
                        if ($receiver['type'] == self::TARGET_GLOBAL) {
                                return 0;
@@ -1055,13 +1040,17 @@ class Receiver
        {
                $urls = [];
 
-               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc', 'as:audience', 'as:attributedTo'] as $element) {
                        $receiver_list = JsonLD::fetchElementArray($activity, $element, '@id');
                        if (empty($receiver_list)) {
                                continue;
                        }
 
                        foreach ($receiver_list as $receiver) {
+                               if ($receiver == 'Public') {
+                                       Logger::warning('Not compacted public collection found', ['activity' => $activity, 'callstack' => System::callstack(20)]);
+                                       $receiver = ActivityPub::PUBLIC_COLLECTION;
+                               }
                                if ($receiver == self::PUBLIC_COLLECTION) {
                                        $receiver = ActivityPub::PUBLIC_COLLECTION;
                                }
@@ -1076,18 +1065,19 @@ class Receiver
         * Fetch the receiver list from an activity array
         *
         * @param array   $activity
-        * @param string  $actor
-        * @param array   $tags
-        * @param boolean $fetch_unlisted
+        * @param string $actor
+        * @param array  $tags
+        * @param bool   $fetch_unlisted
+        * @param bool   $push
         *
         * @return array with receivers (user id)
         * @throws \Exception
         */
-       private static function getReceivers(array $activity, string $actor, array $tags = [], bool $fetch_unlisted = false): array
+       private static function getReceivers(array $activity, string $actor, array $tags, bool $fetch_unlisted, bool $push): array
        {
                $reply = $receivers = $profile = [];
 
-               // When it is an answer, we inherite the receivers from the parent
+               // When it is an answer, we inherit the receivers from the parent
                $replyto = JsonLD::fetchElement($activity, 'as:inReplyTo', '@id');
                if (!empty($replyto)) {
                        $reply = [$replyto];
@@ -1105,18 +1095,13 @@ class Receiver
                        $reply[] = $object_id;
                }
 
-               if (!empty($reply)) {
-                       $parents = Post::select(['uid'], DBA::mergeConditions(['uri' => $reply], ["`uid` != ?", 0]));
-                       while ($parent = Post::fetch($parents)) {
-                               $receivers[$parent['uid']] = ['uid' => $parent['uid'], 'type' => self::TARGET_ANSWER];
-                       }
-                       DBA::close($parents);
-               }
-
                if (!empty($actor)) {
                        $profile   = APContact::getByURL($actor);
                        $followers = $profile['followers'] ?? '';
                        $is_forum  = ($actor['type'] ?? '') == 'Group';
+                       if ($push) {
+                               Contact::updateByUrlIfNeeded($actor);
+                       }
                        Logger::info('Got actor and followers', ['actor' => $actor, 'followers' => $followers]);
                } else {
                        Logger::info('Empty actor', ['activity' => $activity]);
@@ -1127,7 +1112,7 @@ class Receiver
                // We have to prevent false follower assumptions upon thread completions
                $follower_target = empty($activity['thread-completion']) ? self::TARGET_FOLLOWER : self::TARGET_UNKNOWN;
 
-               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc','as:audience'] as $element) {
                        $receiver_list = JsonLD::fetchElementArray($activity, $element, '@id');
                        if (empty($receiver_list)) {
                                continue;
@@ -1188,6 +1173,9 @@ class Receiver
                                                case 'as:bcc':
                                                        $type = self::TARGET_BCC;
                                                        break;
+                                               case 'as:audience':
+                                                       $type = self::TARGET_AUDIENCE;
+                                                       break;
                                        }
 
                                        $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $type];
@@ -1195,10 +1183,18 @@ class Receiver
                        }
                }
 
+               if (!empty($reply) && (!empty($receivers[0]) || !empty($receivers[-1]))) {
+                       $parents = Post::select(['uid'], DBA::mergeConditions(['uri' => $reply], ["`uid` != ?", 0]));
+                       while ($parent = Post::fetch($parents)) {
+                               $receivers[$parent['uid']] = ['uid' => $parent['uid'], 'type' => self::TARGET_ANSWER];
+                       }
+                       DBA::close($parents);
+               }
+
                self::switchContacts($receivers, $actor);
 
                // "birdsitelive" is a service that mirrors tweets into the fediverse
-               // These posts can be fetched without authentification, but are not marked as public
+               // These posts can be fetched without authentication, but are not marked as public
                // We treat them as unlisted posts to be able to handle them.
                if (empty($receivers) && $fetch_unlisted && Contact::isPlatform($actor, 'birdsitelive')) {
                        $receivers[0]  = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
@@ -1387,9 +1383,9 @@ class Receiver
        }
 
        /**
-        * Fetches the object data from external ressources if needed
+        * Fetches the object data from external resources if needed
         *
-        * @param string  $object_id    Object ID of the the provided object
+        * @param string  $object_id    Object ID of the provided object
         * @param array   $object       The provided object array
         * @param boolean $trust_source Do we trust the provided object?
         * @param integer $uid          User ID for the signature that we use to fetch data
@@ -1463,14 +1459,6 @@ class Receiver
                        return $object_data;
                }
 
-               if ($type == 'as:Announce') {
-                       $object_id = JsonLD::fetchElement($object, 'object', '@id');
-                       if (empty($object_id) || !is_string($object_id)) {
-                               return false;
-                       }
-                       return self::fetchObject($object_id, [], false, $uid);
-               }
-
                Logger::info('Unhandled object type: ' . $type);
                return false;
        }
@@ -1661,7 +1649,7 @@ class Receiver
                                                'type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
                                                'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType', '@value'),
                                                'name' => JsonLD::fetchElement($attachment, 'as:name', '@value'),
-                                               'url' => JsonLD::fetchElement($attachment, 'as:url', '@id'),
+                                               'url' => JsonLD::fetchElement($attachment, 'as:url', '@id') ?? JsonLD::fetchElement($attachment, 'as:href', '@id'),
                                                'height' => JsonLD::fetchElement($attachment, 'as:height', '@value'),
                                                'width' => JsonLD::fetchElement($attachment, 'as:width', '@value'),
                                                'image' => JsonLD::fetchElement($attachment, 'as:image', '@id')
@@ -1878,6 +1866,35 @@ class Receiver
                        return false;
                }
 
+               $object_data = self::getObjectDataFromActivity($object);
+
+               $receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true, false);
+               $receivers = $reception_types = [];
+               foreach ($receiverdata as $key => $data) {
+                       $receivers[$key] = $data['uid'];
+                       $reception_types[$data['uid']] = $data['type'] ?? 0;
+               }
+
+               $object_data['receiver_urls']  = self::getReceiverURL($object);
+               $object_data['receiver']       = $receivers;
+               $object_data['reception_type'] = $reception_types;
+
+               $object_data['unlisted'] = in_array(-1, $object_data['receiver']);
+               unset($object_data['receiver'][-1]);
+               unset($object_data['reception_type'][-1]);
+
+               return $object_data;
+       }
+
+       /**
+        * Create an object data array from a given activity
+        *
+        * @param array $object
+        *
+        * @return array Object data
+        */
+       public static function getObjectDataFromActivity(array $object): array
+       {
                $object_data = [];
                $object_data['object_type'] = JsonLD::fetchElement($object, '@type');
                $object_data['id'] = JsonLD::fetchElement($object, '@id');
@@ -1888,7 +1905,7 @@ class Receiver
                        $object_data['reply-to-id'] = $object_data['id'];
 
                        // On activities the "reply to" is the id of the object it refers to
-                       if (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
+                       if (in_array($object_data['object_type'], array_merge(self::ACTIVITY_TYPES, ['as:Announce']))) {
                                $object_id = JsonLD::fetchElement($object, 'as:object', '@id');
                                if (!empty($object_id)) {
                                        $object_data['reply-to-id'] = $object_id;
@@ -2006,21 +2023,6 @@ class Receiver
                        $object_data['question'] = self::processQuestion($object);
                }
 
-               $receiverdata = self::getReceivers($object, $object_data['actor'] ?? '', $object_data['tags'], true);
-               $receivers = $reception_types = [];
-               foreach ($receiverdata as $key => $data) {
-                       $receivers[$key] = $data['uid'];
-                       $reception_types[$data['uid']] = $data['type'] ?? 0;
-               }
-
-               $object_data['receiver_urls']  = self::getReceiverURL($object);
-               $object_data['receiver']       = $receivers;
-               $object_data['reception_type'] = $reception_types;
-
-               $object_data['unlisted'] = in_array(-1, $object_data['receiver']);
-               unset($object_data['receiver'][-1]);
-               unset($object_data['reception_type'][-1]);
-
                return $object_data;
        }