]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/ActivityPub/Receiver.php
Add and delete entries
[friendica.git] / src / Protocol / ActivityPub / Receiver.php
index 80bba0b0b9e8070e070715c537df4be1026ea393..11e7151e1e9f57e7bff9b0cd1d86390bce6a8d12 100644 (file)
@@ -28,6 +28,7 @@ use Friendica\Content\Text\Markdown;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
+use Friendica\Database\Database;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\APContact;
@@ -36,6 +37,7 @@ use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
@@ -80,12 +82,13 @@ class Receiver
        /**
         * Checks incoming message from the inbox
         *
-        * @param         $body
-        * @param         $header
+        * @param string  $body Body string
+        * @param array   $header Header lines
         * @param integer $uid User ID
+        * @return void
         * @throws \Exception
         */
-       public static function processInbox($body, $header, $uid)
+       public static function processInbox(string $body, array $header, int $uid)
        {
                $activity = json_decode($body, true);
                if (empty($activity)) {
@@ -95,9 +98,10 @@ class Receiver
 
                $ldactivity = JsonLD::compact($activity);
 
-               $actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id');
+               $actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id') ?? '';
 
                $apcontact = APContact::getByURL($actor);
+
                if (empty($apcontact)) {
                        Logger::notice('Unable to retrieve AP contact for actor - message is discarded', ['actor' => $actor]);
                        return;
@@ -151,7 +155,46 @@ class Receiver
                        $trust_source = false;
                }
 
-               self::processActivity($ldactivity, $body, $uid, $trust_source, true, $signer);
+               $fetchQueue = new FetchQueue();
+               self::processActivity($fetchQueue, $ldactivity, $body, $uid, $trust_source, true, $signer, $http_signer);
+               $fetchQueue->process();
+       }
+
+       private static function enqueuePost(array $ldactivity = [], string $type, int $uid, string $http_signer): array
+       {
+               $fields = [
+                       'activity-id' => $ldactivity['id'],
+                       'object-id' => $ldactivity['object_id'],
+                       'type' => $type,
+                       'object-type' => $ldactivity['object_type'],
+                       'activity' => json_encode($ldactivity, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT),
+                       'received' => DateTimeFormat::utcNow(),
+               ];
+
+               if (!empty($ldactivity['object_object_type'])) {
+                       $fields['object-object-type'] = $ldactivity['object_object_type'];
+               }
+
+               if (!empty($http_signer)) {
+                       $fields['signer'] = $http_signer;
+               }
+
+               DBA::insert('inbox-entry', $fields, Database::INSERT_IGNORE);
+
+               $queue = DBA::selectFirst('inbox-entry', ['id'], ['activity-id' => $ldactivity['id']]);
+               if (!empty($queue['id'])) {
+                       $ldactivity['entry-id'] = $queue['id'];
+                       DBA::insert('inbox-entry-receiver', ['queue-id' => $queue['id'], 'uid' => $uid], Database::INSERT_IGNORE);
+               }
+               return $ldactivity;
+       }
+
+       public static function removeFromQueue(array $activity = [])
+       {
+               if (empty($activity['entry-id'])) {
+                       return;
+               }
+               DBA::delete('inbox-entry', ['id' => $activity['entry-id']]);
        }
 
        /**
@@ -199,12 +242,16 @@ class Receiver
                        return;
                }
 
-               $id = Processor::fetchMissingActivity($object_id, [], $actor, self::COMPLETION_RELAY);
+               $fetchQueue = new FetchQueue();
+
+               $id = Processor::fetchMissingActivity($fetchQueue, $object_id, [], $actor, self::COMPLETION_RELAY);
                if (empty($id)) {
                        Logger::notice('Relayed message had not been fetched', ['id' => $object_id]);
                        return;
                }
 
+               $fetchQueue->process();
+
                $item_id = Item::searchByLink($object_id);
                if ($item_id) {
                        Logger::info('Relayed message had been fetched and stored', ['id' => $object_id, 'item' => $item_id]);
@@ -220,11 +267,11 @@ class Receiver
         * @param string  $object_id Object ID of the the provided object
         * @param integer $uid       User ID
         *
-        * @return string with object type
+        * @return string with object type or NULL
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function fetchObjectType($activity, $object_id, $uid = 0)
+       private static function fetchObjectType(array $activity, string $object_id, int $uid = 0)
        {
                if (!empty($activity['as:object'])) {
                        $object_type = JsonLD::fetchElement($activity['as:object'], '@type');
@@ -268,7 +315,7 @@ class Receiver
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function prepareObjectData($activity, $uid, $push, &$trust_source)
+       public static function prepareObjectData(array $activity, int $uid, bool $push, bool &$trust_source): array
        {
                $id = JsonLD::fetchElement($activity, '@id');
                if (!empty($id) && !$trust_source) {
@@ -458,7 +505,7 @@ class Receiver
         * @param array $receivers Array with receivers
         * @return integer user id;
         */
-       public static function getFirstUserFromReceivers($receivers)
+       public static function getFirstUserFromReceivers(array $receivers): int
        {
                foreach ($receivers as $receiver) {
                        if (!empty($receiver)) {
@@ -471,15 +518,17 @@ class Receiver
        /**
         * Processes the activity object
         *
-        * @param array   $activity     Array with activity data
-        * @param string  $body         The unprocessed body
-        * @param integer $uid          User ID
-        * @param boolean $trust_source Do we trust the source?
-        * @param boolean $push         Message had been pushed to our system
-        * @param array   $signer       The signer of the post
-        * @throws \Exception
+        * @param FetchQueue $fetchQueue
+        * @param array      $activity     Array with activity data
+        * @param string     $body         The unprocessed body
+        * @param int|null   $uid          User ID
+        * @param boolean    $trust_source Do we trust the source?
+        * @param boolean    $push         Message had been pushed to our system
+        * @param array      $signer       The signer of the post
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function processActivity($activity, string $body = '', int $uid = null, bool $trust_source = false, bool $push = false, array $signer = [])
+       public static function processActivity(FetchQueue $fetchQueue, array $activity, string $body = '', int $uid = null, bool $trust_source = false, bool $push = false, array $signer = [], string $http_signer = '')
        {
                $type = JsonLD::fetchElement($activity, '@type');
                if (!$type) {
@@ -553,10 +602,16 @@ class Receiver
                        $object_data['from-relay'] = $activity['from-relay'];
                }
 
+               $object_data = self::enqueuePost($object_data, $type, $uid, $http_signer);
+
+               if (in_array('as:Question', [$object_data['object_type'] ?? '', $object_data['object_object_type'] ?? ''])) {
+                       self::storeUnhandledActivity(false, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
+               }
+
                switch ($type) {
                        case 'as:Create':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       $item = ActivityPub\Processor::createItem($object_data);
+                                       $item = ActivityPub\Processor::createItem($fetchQueue, $object_data);
                                        ActivityPub\Processor::postItem($object_data, $item);
                                } elseif (in_array($object_data['object_type'], ['pt:CacheFile'])) {
                                        // Unhandled Peertube activity
@@ -567,7 +622,7 @@ class Receiver
 
                        case 'as:Invite':
                                if (in_array($object_data['object_type'], ['as:Event'])) {
-                                       $item = ActivityPub\Processor::createItem($object_data);
+                                       $item = ActivityPub\Processor::createItem($fetchQueue, $object_data);
                                        ActivityPub\Processor::postItem($object_data, $item);
                                } else {
                                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
@@ -591,7 +646,7 @@ class Receiver
                                        $object_data['thread-completion'] = Contact::getIdForURL($actor);
                                        $object_data['completion-mode']   = self::COMPLETION_ANNOUCE;
 
-                                       $item = ActivityPub\Processor::createItem($object_data);
+                                       $item = ActivityPub\Processor::createItem($fetchQueue, $object_data);
                                        if (empty($item)) {
                                                return;
                                        }
@@ -610,7 +665,7 @@ class Receiver
                                                $announce_object_data['raw'] = $body;
                                        }
 
-                                       ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $announce_object_data, Activity::ANNOUNCE);
                                } else {
                                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
                                }
@@ -618,7 +673,7 @@ class Receiver
 
                        case 'as:Like':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createActivity($object_data, Activity::LIKE);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::LIKE);
                                } elseif ($object_data['object_type'] == '') {
                                        // The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity.
                                } else {
@@ -628,7 +683,7 @@ class Receiver
 
                        case 'as:Dislike':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createActivity($object_data, Activity::DISLIKE);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::DISLIKE);
                                } elseif ($object_data['object_type'] == '') {
                                        // The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity.
                                } else {
@@ -638,7 +693,7 @@ class Receiver
 
                        case 'as:TentativeAccept':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createActivity($object_data, Activity::ATTENDMAYBE);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::ATTENDMAYBE);
                                } else {
                                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
                                }
@@ -646,7 +701,7 @@ class Receiver
 
                        case 'as:Update':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::updateItem($object_data);
+                                       ActivityPub\Processor::updateItem($fetchQueue, $object_data);
                                } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
                                        ActivityPub\Processor::updatePerson($object_data);
                                } elseif (in_array($object_data['object_type'], ['pt:CacheFile'])) {
@@ -670,8 +725,7 @@ class Receiver
 
                        case 'as:Block':
                                if (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
-                                       // Used by Mastodon to announce that the sender has blocked the account
-                                       self::storeUnhandledActivity(false, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
+                                       ActivityPub\Processor::blockAccount($object_data);
                                } else {
                                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
                                }
@@ -692,7 +746,7 @@ class Receiver
                                        ActivityPub\Processor::followUser($object_data);
                                } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
                                        $object_data['reply-to-id'] = $object_data['object_id'];
-                                       ActivityPub\Processor::createActivity($object_data, Activity::FOLLOW);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::FOLLOW);
                                } else {
                                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
                                }
@@ -702,7 +756,7 @@ class Receiver
                                if ($object_data['object_type'] == 'as:Follow') {
                                        ActivityPub\Processor::acceptFollowUser($object_data);
                                } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createActivity($object_data, Activity::ATTEND);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::ATTEND);
                                } else {
                                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
                                }
@@ -712,7 +766,7 @@ class Receiver
                                if ($object_data['object_type'] == 'as:Follow') {
                                        ActivityPub\Processor::rejectFollowUser($object_data);
                                } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createActivity($object_data, Activity::ATTENDNO);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::ATTENDNO);
                                } else {
                                        self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
                                }
@@ -728,6 +782,9 @@ class Receiver
                                } elseif (($object_data['object_type'] == 'as:Accept') &&
                                        in_array($object_data['object_object_type'], self::ACCOUNT_TYPES)) {
                                        ActivityPub\Processor::rejectFollowUser($object_data);
+                               } elseif (($object_data['object_type'] == 'as:Block') &&
+                                       in_array($object_data['object_object_type'], self::ACCOUNT_TYPES)) {
+                                       ActivityPub\Processor::unblockAccount($object_data);
                                } elseif (in_array($object_data['object_type'], array_merge(self::ACTIVITY_TYPES, ['as:Announce'])) &&
                                        in_array($object_data['object_object_type'], array_merge(['as:Tombstone'], self::CONTENT_TYPES))) {
                                        ActivityPub\Processor::undoActivity($object_data);
@@ -744,7 +801,7 @@ class Receiver
 
                        case 'as:View':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createActivity($object_data, Activity::VIEW);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::VIEW);
                                } elseif ($object_data['object_type'] == '') {
                                        // The object type couldn't be determined. Most likely we don't have it here. We ignore this activity.
                                } else {
@@ -754,7 +811,7 @@ class Receiver
 
                        case 'litepub:EmojiReact':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createActivity($object_data, Activity::EMOJIREACT);
+                                       ActivityPub\Processor::createActivity($fetchQueue, $object_data, Activity::EMOJIREACT);
                                } elseif ($object_data['object_type'] == '') {
                                        // The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity.
                                } else {
@@ -800,7 +857,7 @@ class Receiver
                }
 
                $tempfile = tempnam(System::getTempPath(), $file);
-               file_put_contents($tempfile, json_encode(['activity' => $activity, 'body' => $body, 'uid' => $uid, 'trust_source' => $trust_source, 'push' => $push, 'signer' => $signer, 'object_data' => $object_data], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+               file_put_contents($tempfile, json_encode(['activity' => $activity, 'body' => $body, 'uid' => $uid, 'trust_source' => $trust_source, 'push' => $push, 'signer' => $signer, 'object_data' => $object_data], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
                Logger::notice('Unknown activity stored', ['type' => $type, 'object_type' => $object_data['object_type'], $object_data['object_object_type'] ?? '', 'file' => $tempfile]);
        }
 
@@ -812,7 +869,7 @@ class Receiver
         *
         * @return int   user id
         */
-       public static function getBestUserForActivity(array $activity)
+       public static function getBestUserForActivity(array $activity): int
        {
                $uid = 0;
                $actor = JsonLD::fetchElement($activity, 'as:actor', '@id') ?? '';
@@ -838,7 +895,8 @@ class Receiver
                return $uid;
        }
 
-       public static function getReceiverURL($activity)
+       // @TODO Missing documentation
+       public static function getReceiverURL(array $activity): array
        {
                $urls = [];
 
@@ -870,9 +928,9 @@ class Receiver
         * @return array with receivers (user id)
         * @throws \Exception
         */
-       private static function getReceivers($activity, $actor, $tags = [], $fetch_unlisted = false)
+       private static function getReceivers(array $activity, string $actor, array $tags = [], bool $fetch_unlisted = false): array
        {
-               $reply = $receivers = [];
+               $reply = $receivers = $profile = [];
 
                // When it is an answer, we inherite the receivers from the parent
                $replyto = JsonLD::fetchElement($activity, 'as:inReplyTo', '@id');
@@ -932,7 +990,7 @@ class Receiver
 
                                // Fetch the receivers for the public and the followers collection
                                if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$is_forum)) && !empty($actor)) {
-                                       $receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target);
+                                       $receivers = self::getReceiverForActor($actor, $tags, $receivers, $follower_target, $profile);
                                        continue;
                                }
 
@@ -994,33 +1052,46 @@ class Receiver
         * @param array   $tags
         * @param array   $receivers
         * @param integer $target_type
+        * @param array   $profile
         *
         * @return array with receivers (user id)
         * @throws \Exception
         */
-       private static function getReceiverForActor($actor, $tags, $receivers, $target_type)
+       private static function getReceiverForActor(string $actor, array $tags, array $receivers, int $target_type, array $profile): array
        {
                $basecondition = ['rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER],
                        'network' => Protocol::FEDERATED, 'archive' => false, 'pending' => false];
 
-               $condition = DBA::mergeConditions($basecondition, ["`nurl` = ? AND `uid` != ?", Strings::normaliseLink($actor), 0]);
-               $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
-               while ($contact = DBA::fetch($contacts)) {
-                       if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
-                               $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
+               if (!empty($profile['uri-id'])) {
+                       $condition = DBA::mergeConditions($basecondition, ["`uri-id` = ? AND `uid` != ?", $profile['uri-id'], 0]);
+                       $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
+                       while ($contact = DBA::fetch($contacts)) {
+                               if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
+                                       $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
+                               }
                        }
-               }
-               DBA::close($contacts);
-
-               // The queries are split because of performance issues
-               $condition = DBA::mergeConditions($basecondition, ["`alias` IN (?, ?) AND `uid` != ?", Strings::normaliseLink($actor), $actor, 0]);
-               $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
-               while ($contact = DBA::fetch($contacts)) {
-                       if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
-                               $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
+                       DBA::close($contacts);
+               } else {
+                       // This part will only be called while post update 1426 wasn't finished
+                       $condition = DBA::mergeConditions($basecondition, ["`nurl` = ? AND `uid` != ?", Strings::normaliseLink($actor), 0]);
+                       $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
+                       while ($contact = DBA::fetch($contacts)) {
+                               if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
+                                       $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
+                               }
+                       }
+                       DBA::close($contacts);
+
+                       // The queries are split because of performance issues
+                       $condition = DBA::mergeConditions($basecondition, ["`alias` IN (?, ?) AND `uid` != ?", Strings::normaliseLink($actor), $actor, 0]);
+                       $contacts = DBA::select('contact', ['uid', 'rel'], $condition);
+                       while ($contact = DBA::fetch($contacts)) {
+                               if (empty($receivers[$contact['uid']]) && self::isValidReceiverForActor($contact, $tags)) {
+                                       $receivers[$contact['uid']] = ['uid' => $contact['uid'], 'type' => $target_type];
+                               }
                        }
+                       DBA::close($contacts);
                }
-               DBA::close($contacts);
                return $receivers;
        }
 
@@ -1028,13 +1099,12 @@ class Receiver
         * Tests if the contact is a valid receiver for this actor
         *
         * @param array  $contact
-        * @param string $actor
         * @param array  $tags
         *
         * @return bool with receivers (user id)
         * @throws \Exception
         */
-       private static function isValidReceiverForActor($contact, $tags)
+       private static function isValidReceiverForActor(array $contact, array $tags): bool
        {
                // Are we following the contact? Then this is a valid receiver
                if (in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND])) {
@@ -1067,10 +1137,11 @@ class Receiver
         * @param integer $cid Contact ID
         * @param integer $uid User ID
         * @param string  $url Profile URL
+        * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function switchContact($cid, $uid, $url)
+       public static function switchContact(int $cid, int $uid, string $url)
        {
                if (DBA::exists('contact', ['id' => $cid, 'network' => Protocol::ACTIVITYPUB])) {
                        Logger::info('Contact is already ActivityPub', ['id' => $cid, 'uid' => $uid, 'url' => $url]);
@@ -1089,10 +1160,11 @@ class Receiver
        }
 
        /**
-        *
+        * @TODO Fix documentation and type-hints
         *
         * @param $receivers
         * @param $actor
+        * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -1116,14 +1188,14 @@ class Receiver
        }
 
        /**
-        *
+        * @TODO Fix documentation and type-hints
         *
         * @param       $object_data
         * @param array $activity
         *
         * @return mixed
         */
-       private static function addActivityFields($object_data, $activity)
+       private static function addActivityFields($object_data, array $activity)
        {
                if (!empty($activity['published']) && empty($object_data['published'])) {
                        $object_data['published'] = JsonLD::fetchElement($activity, 'as:published', '@value');
@@ -1243,7 +1315,7 @@ class Receiver
         * @param array $languages
         * @return array Languages
         */
-       public static function processLanguages(array $languages)
+       public static function processLanguages(array $languages): array
        {
                if (empty($languages)) {
                        return [];
@@ -1266,7 +1338,7 @@ class Receiver
         *
         * @return array with tags in a simplified format
         */
-       public static function processTags(array $tags)
+       public static function processTags(array $tags): array
        {
                $taglist = [];
 
@@ -1298,7 +1370,7 @@ class Receiver
         * @param array $emojis
         * @return array with emojis in a simplified format
         */
-       private static function processEmojis(array $emojis)
+       private static function processEmojis(array $emojis): array
        {
                $emojilist = [];
 
@@ -1324,7 +1396,7 @@ class Receiver
         *
         * @return array Attachments in a simplified format
         */
-       private static function processAttachments(array $attachments)
+       private static function processAttachments(array $attachments): array
        {
                $attachlist = [];
 
@@ -1434,16 +1506,75 @@ class Receiver
                return $attachlist;
        }
 
+       /**
+        * Convert questions from JSON-LD format into a simplified format
+        *
+        * @param array $object
+        *
+        * @return array Questions in a simplified format
+        */
+       private static function processQuestion(array $object): array
+       {
+               $question = [];
+
+               if (!empty($object['as:oneOf'])) {
+                       $question['multiple'] = false;
+                       $options = JsonLD::fetchElementArray($object, 'as:oneOf') ?? [];
+               } elseif (!empty($object['as:anyOf'])) {
+                       $question['multiple'] = true;
+                       $options = JsonLD::fetchElementArray($object, 'as:anyOf') ?? [];
+               } else {
+                       return [];
+               }
+
+               $closed = JsonLD::fetchElement($object, 'as:closed', '@value');
+               if (!empty($closed)) {
+                       $question['end-time'] = $closed;
+               } else {
+                       $question['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value');
+               }
+
+               $question['voters']  = (int)JsonLD::fetchElement($object, 'toot:votersCount', '@value');
+               $question['options'] = [];
+
+               $voters = 0;
+
+               foreach ($options as $option) {
+                       if (JsonLD::fetchElement($option, '@type') != 'as:Note') {
+                               continue;
+                       }
+
+                       $name = JsonLD::fetchElement($option, 'as:name', '@value');
+
+                       if (empty($option['as:replies'])) {
+                               continue;
+                       }
+
+                       $replies = JsonLD::fetchElement($option['as:replies'], 'as:totalItems', '@value');
+
+                       $question['options'][] = ['name' => $name, 'replies' => $replies];
+
+                       $voters += (int)$replies;
+               }
+
+               // For single choice question we can count the number of voters if not provided (like with Misskey)
+               if (empty($question['voters']) && !$question['multiple']) {
+                       $question['voters'] = $voters;
+               }
+
+               return $question;
+       }
+
        /**
         * Fetch the original source or content with the "language" Markdown or HTML
         *
         * @param array $object
         * @param array $object_data
         *
-        * @return array
+        * @return array Object data (?)
         * @throws \Exception
         */
-       private static function getSource($object, $object_data)
+       private static function getSource(array $object, array $object_data): array
        {
                $object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
                $object_data['source'] = JsonLD::fetchElement($object_data, 'source', '@value');
@@ -1572,10 +1703,10 @@ class Receiver
         *
         * @param array $object
         *
-        * @return array
+        * @return array|bool Object data or FALSE if $object does not contain @id element
         * @throws \Exception
         */
-       private static function processObject($object)
+       private static function processObject(array $object)
        {
                if (!JsonLD::fetchElement($object, '@id')) {
                        return false;
@@ -1685,7 +1816,11 @@ class Receiver
                        $object_data['alternate-url'] = null;
                }
 
-               $receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
+               if ($object_data['object_type'] == 'as:Question') {
+                       $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'];