]> git.mxchange.org Git - friendica.git/blobdiff - src/Protocol/ActivityPub/Processor.php
$id in Transmitter::sendContactAccept() is a string, see Introduction class
[friendica.git] / src / Protocol / ActivityPub / Processor.php
index 79d24d16024538b997b0050d12ad08df90e72d33..d9dd7ee5b321993c99ad2249bb31375f1a8d04f2 100644 (file)
@@ -27,6 +27,7 @@ use Friendica\Content\Text\Markdown;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
@@ -46,6 +47,7 @@ use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\JsonLD;
 use Friendica\Util\Strings;
+use Friendica\Worker\Delivery;
 
 /**
  * ActivityPub Processor Protocol class
@@ -69,7 +71,7 @@ class Processor
         * @param array $languages
         * @return string language JSON
         */
-       private static function processLanguages(array $languages)
+       private static function processLanguages(array $languages): string
        {
                $codes = array_keys($languages);
                $lang = [];
@@ -86,12 +88,13 @@ class Processor
        /**
         * Replaces emojis in the body
         *
-        * @param array $emojis
+        * @param int $uri_id
         * @param string $body
+        * @param array $emojis
         *
         * @return string with replaced emojis
         */
-       private static function replaceEmojis(int $uri_id, $body, array $emojis)
+       private static function replaceEmojis(int $uri_id, string $body, array $emojis): string
        {
                $body = strtr($body,
                        array_combine(
@@ -141,7 +144,7 @@ class Processor
         * @param array   $activity
         * @param array   $item
         */
-       private static function storeAttachments($activity, $item)
+       private static function storeAttachments(array $activity, array $item)
        {
                if (empty($activity['attachments'])) {
                        return;
@@ -152,18 +155,53 @@ class Processor
                }
        }
 
+       /**
+        * Store attachment data
+        *
+        * @param array   $activity
+        * @param array   $item
+        */
+       private static function storeQuestion(array $activity, array $item)
+       {
+               if (empty($activity['question'])) {
+                       return;
+               }
+               $question = ['multiple' => $activity['question']['multiple']];
+
+               if (!empty($activity['question']['voters'])) {
+                       $question['voters'] = $activity['question']['voters'];
+               }
+
+               if (!empty($activity['question']['end-time'])) {
+                       $question['end-time'] = DateTimeFormat::utc($activity['question']['end-time']);
+               }
+
+               Post\Question::update($item['uri-id'], $question);
+
+               foreach ($activity['question']['options'] as $key => $option) {
+                       $option = ['name' => $option['name'], 'replies' => $option['replies']];
+                       Post\QuestionOption::update($item['uri-id'], $key, $option);
+               }
+
+               Logger::debug('Storing incoming question', ['type' => $activity['type'], 'uri-id' => $item['uri-id'], 'question' => $activity['question']]);
+       }
+
        /**
         * Updates a message
         *
         * @param array $activity Activity array
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function updateItem($activity)
+       public static function updateItem(array $activity)
        {
                $item = Post::selectFirst(['uri', 'uri-id', 'thr-parent', 'gravity', 'post-type'], ['uri' => $activity['id']]);
                if (!DBA::isResult($item)) {
                        Logger::warning('No existing item, item will be created', ['uri' => $activity['id']]);
                        $item = self::createItem($activity);
+                       if (empty($item)) {
+                               return;
+                       }
+
                        self::postItem($activity, $item);
                        return;
                }
@@ -174,11 +212,13 @@ class Processor
                $item = self::processContent($activity, $item);
 
                self::storeAttachments($activity, $item);
+               self::storeQuestion($activity, $item);
 
                if (empty($item)) {
                        return;
                }
 
+               Post\History::add($item['uri-id'], $item);
                Item::update($item, ['uri' => $activity['id']]);
 
                if ($activity['object_type'] == 'as:Event') {
@@ -192,8 +232,8 @@ class Processor
        /**
         * Update an existing event
         *
-        * @param int $event_id 
-        * @param array $activity 
+        * @param int $event_id
+        * @param array $activity
         */
        private static function updateEvent(int $event_id, array $activity)
        {
@@ -202,8 +242,12 @@ class Processor
                $event['edited']   = DateTimeFormat::utc($activity['updated']);
                $event['summary']  = HTML::toBBCode($activity['name']);
                $event['desc']     = HTML::toBBCode($activity['content']);
-               $event['start']    = $activity['start-time'];
-               $event['finish']   = $activity['end-time'];
+               if (!empty($activity['start-time'])) {
+                       $event['start']  = DateTimeFormat::utc($activity['start-time']);
+               }
+               if (!empty($activity['end-time'])) {
+                       $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+               }
                $event['nofinish'] = empty($event['finish']);
                $event['location'] = $activity['location'];
 
@@ -219,7 +263,7 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function createItem($activity)
+       public static function createItem(array $activity): array
        {
                $item = [];
                $item['verb'] = Activity::POST;
@@ -235,7 +279,7 @@ class Processor
 
                if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Post::exists(['uri' => $activity['reply-to-id']])) {
                        Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id']]);
-                       self::fetchMissingActivity($activity['reply-to-id'], $activity);
+                       self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
                }
 
                $item['diaspora_signed_text'] = $activity['diaspora:comment'] ?? '';
@@ -343,6 +387,7 @@ class Processor
                $item['plink'] = $activity['alternate-url'] ?? $item['uri'];
 
                self::storeAttachments($activity, $item);
+               self::storeQuestion($activity, $item);
 
                // We received the post via AP, so we set the protocol of the server to AP
                $contact = Contact::getById($item['author-id'], ['gsid']);
@@ -367,7 +412,7 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function deleteItem($activity)
+       public static function deleteItem(array $activity)
        {
                $owner = Contact::getIdForURL($activity['actor']);
 
@@ -382,7 +427,7 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function addTag($activity)
+       public static function addTag(array $activity)
        {
                if (empty($activity['object_content']) || empty($activity['object_id'])) {
                        return;
@@ -413,20 +458,101 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function createActivity($activity, $verb)
+       public static function createActivity(array $activity, string $verb)
        {
                $item = self::createItem($activity);
+               if (empty($item)) {
+                       return;
+               }
+
                $item['verb'] = $verb;
                $item['thr-parent'] = $activity['object_id'];
                $item['gravity'] = GRAVITY_ACTIVITY;
                unset($item['post-type']);
                $item['object-type'] = Activity\ObjectType::NOTE;
 
+               if (!empty($activity['content'])) {
+                       $item['body'] = HTML::toBBCode($activity['content']);
+               }
+
                $item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
 
                self::postItem($activity, $item);
        }
 
+       /**
+        * Fetch the Uri-Id of a post for the "featured" collection
+        *
+        * @param array $activity
+        * @return null|int
+        */
+       private static function getUriIdForFeaturedCollection(array $activity)
+       {
+               $actor = APContact::getByURL($activity['actor']);
+               if (empty($actor)) {
+                       return null;
+               }
+
+               // Refetch the account when the "featured" collection is missing.
+               // This can be removed in a future version (end of 2022 should be good).
+               if (empty($actor['featured'])) {
+                       $actor = APContact::getByURL($activity['actor'], true);
+                       if (empty($actor)) {
+                               return null;
+                       }
+               }
+
+               if ($activity['target_id'] != $actor['featured']) {
+                       return null;
+               }
+
+               $id = Contact::getIdForURL($activity['actor']);
+               if (empty($id)) {
+                       return null;
+               }
+
+               $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id'], 'author-id' => $id]);
+               if (!empty($parent['uri-id'])) {
+                       return $parent['uri-id'];
+               }
+
+               return null;
+       }
+
+       /**
+        * Add a post to the "Featured" collection
+        *
+        * @param array $activity
+        */
+       public static function addToFeaturedCollection(array $activity)
+       {
+               $uriid = self::getUriIdForFeaturedCollection($activity);
+               if (empty($uriid)) {
+                       return;
+               }
+
+               Logger::debug('Add post to featured collection', ['uri-id' => $uriid]);
+
+               Post\Collection::add($uriid, Post\Collection::FEATURED);
+       }
+
+       /**
+        * Remove a post to the "Featured" collection
+        *
+        * @param array $activity
+        */
+       public static function removeFromFeaturedCollection(array $activity)
+       {
+               $uriid = self::getUriIdForFeaturedCollection($activity);
+               if (empty($uriid)) {
+                       return;
+               }
+
+               Logger::debug('Remove post from featured collection', ['uri-id' => $uriid]);
+
+               Post\Collection::remove($uriid, Post\Collection::FEATURED);
+       }
+
        /**
         * Create an event
         *
@@ -436,12 +562,16 @@ class Processor
         * @return int event id
         * @throws \Exception
         */
-       public static function createEvent($activity, $item)
+       public static function createEvent(array $activity, array $item): int
        {
-               $event['summary']   = HTML::toBBCode($activity['name']);
+               $event['summary']   = HTML::toBBCode($activity['name'] ?: $activity['summary']);
                $event['desc']      = HTML::toBBCode($activity['content']);
-               $event['start']     = $activity['start-time'];
-               $event['finish']    = $activity['end-time'];
+               if (!empty($activity['start-time'])) {
+                       $event['start']  = DateTimeFormat::utc($activity['start-time']);
+               }
+               if (!empty($activity['end-time'])) {
+                       $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+               }
                $event['nofinish']  = empty($event['finish']);
                $event['location']  = $activity['location'];
                $event['cid']       = $item['contact-id'];
@@ -476,20 +606,22 @@ class Processor
         * @return array|bool Returns the item array or false if there was an unexpected occurrence
         * @throws \Exception
         */
-       private static function processContent($activity, $item)
+       private static function processContent(array $activity, array $item)
        {
                if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) {
-                       $item['title'] = Markdown::toBBCode($activity['name']);
+                       $item['title'] = strip_tags($activity['name']);
                        $content = Markdown::toBBCode($activity['content']);
                } elseif (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/bbcode')) {
                        $item['title'] = $activity['name'];
                        $content = $activity['content'];
                } else {
                        // By default assume "text/html"
-                       $item['title'] = HTML::toBBCode($activity['name']);
-                       $content = HTML::toBBCode($activity['content']);
+                       $item['title'] = HTML::toBBCode($activity['name'] ?? '');
+                       $content = HTML::toBBCode($activity['content'] ?? '');
                }
 
+               $item['title'] = trim(BBCode::toPlaintext($item['title']));
+
                if (!empty($activity['languages'])) {
                        $item['language'] = self::processLanguages($activity['languages']);
                }
@@ -519,7 +651,7 @@ class Processor
 
                                $content = self::removeImplicitMentionsFromBody($content, $parent);
                        }
-                       $item['content-warning'] = HTML::toBBCode($activity['summary']);
+                       $item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
                        $item['raw-body'] = $item['body'] = $content;
                }
 
@@ -553,12 +685,12 @@ class Processor
        }
 
        /**
-        * Generate a GUID out of an URL
+        * Generate a GUID out of an URL of an ActivityPub post.
         *
         * @param string $url message URL
         * @return string with GUID
         */
-       private static function getGUIDByURL(string $url)
+       private static function getGUIDByURL(string $url): string
        {
                $parsed = parse_url($url);
 
@@ -572,6 +704,56 @@ class Processor
                return $host_hash . '-'. hash('fnv164', $path) . '-'. hash('joaat', $path);
        }
 
+       /**
+        * Checks if an incoming message is wanted
+        *
+        * @param array $activity
+        * @param array $item
+        * @return boolean Is the message wanted?
+        */
+       private static function isSolicitedMessage(array $activity, array $item): bool
+       {
+               // The checks are split to improve the support when searching why a message was accepted.
+               if (count($activity['receiver']) != 1) {
+                       // The message has more than one receiver, so it is wanted.
+                       Logger::debug('Message has got several receivers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
+                       return true;
+               }
+
+               if ($item['private'] == Item::PRIVATE) {
+                       // We only look at public posts here. Private posts are expected to be intentionally posted to the single receiver.
+                       Logger::debug('Message is private - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
+                       return true;
+               }
+
+               if (!empty($activity['from-relay'])) {
+                       // We check relay posts at another place. When it arrived here, the message is already checked.
+                       Logger::debug('Message is a relay post that is already checked - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
+                       return true;
+               }
+
+               if (in_array($activity['completion-mode'] ?? Receiver::COMPLETION_NONE, [Receiver::COMPLETION_MANUAL, Receiver::COMPLETION_ANNOUCE])) {
+                       // Manual completions and completions caused by reshares are allowed without any further checks.
+                       Logger::debug('Message is in completion mode - accepted', ['mode' => $activity['completion-mode'], 'uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
+                       return true;
+               }
+
+               if ($item['gravity'] != GRAVITY_PARENT) {
+                       // We cannot reliably check at this point if a comment or activity belongs to an accepted post or needs to be fetched
+                       // This can possibly be improved in the future.
+                       Logger::debug('Message is no parent - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
+                       return true;
+               }
+
+               $tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
+               if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::ACTIVITYPUB)) {
+                       Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
+                       return true;
+               } else {
+                       return false;
+               }
+       }
+
        /**
         * Creates an item post
         *
@@ -589,6 +771,11 @@ class Processor
                $stored = false;
                ksort($activity['receiver']);
 
+               if (!self::isSolicitedMessage($activity, $item)) {
+                       DBA::delete('item-uri', ['id' => $item['uri-id']]);
+                       return;
+               }
+
                foreach ($activity['receiver'] as $receiver) {
                        if ($receiver == -1) {
                                continue;
@@ -768,7 +955,10 @@ class Processor
                                        } else {
                                                $name = trim(parse_url($receiver, PHP_URL_PATH), '/');
                                        }
-                                       Tag::store($uriid, $type, $name, $receiver);
+
+                                       $target = Tag::getTargetType($receiver);
+                                       Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]);
+                                       Tag::store($uriid, $type, $name, $receiver, $target);
                                }
                        }
                }
@@ -782,7 +972,7 @@ class Processor
         * @return int|bool New mail table row id or false on error
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function postMail($activity, $item)
+       private static function postMail(array $activity, array $item)
        {
                if (($item['gravity'] != GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
                        Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
@@ -837,16 +1027,93 @@ class Processor
                return Mail::insert($msg);
        }
 
+       /**
+        * Fetch featured posts from a contact with the given url
+        *
+        * @param string $url
+        * @return void
+        */
+       public static function fetchFeaturedPosts(string $url)
+       {
+               Logger::info('Fetch featured posts', ['contact' => $url]);
+
+               $apcontact = APContact::getByURL($url);
+               if (empty($apcontact['featured'])) {
+                       Logger::info('Contact does not have a featured collection', ['contact' => $url]);
+                       return;
+               }
+
+               $pcid = Contact::getIdForURL($url, 0, false);
+               if (empty($pcid)) {
+                       Logger::info('Contact not found', ['contact' => $url]);
+                       return;
+               }
+
+               $posts = Post\Collection::selectToArrayForContact($pcid, Post\Collection::FEATURED);
+               if (!empty($posts)) {
+                       $old_featured = array_column($posts, 'uri-id');
+               } else {
+                       $old_featured = [];
+               }
+
+               $featured = ActivityPub::fetchItems($apcontact['featured']);
+               if (empty($featured)) {
+                       Logger::info('Contact does not have featured posts', ['contact' => $url]);
+
+                       foreach ($old_featured as $uri_id) {
+                               Post\Collection::remove($uri_id, Post\Collection::FEATURED);
+                               Logger::debug('Removed no longer featured post', ['uri-id' => $uri_id, 'contact' => $url]);
+                       }
+                       return;
+               }
+
+               $new = 0;
+               $old = 0;
+
+               foreach ($featured as $post) {
+                       if (empty($post['id'])) {
+                               continue;
+                       }
+                       $id = Item::fetchByLink($post['id']);
+                       if (!empty($id)) {
+                               $item = Post::selectFirst(['uri-id', 'featured'], ['id' => $id]);
+                               if (!empty($item['uri-id'])) {
+                                       if (!$item['featured']) {
+                                               Post\Collection::add($item['uri-id'], Post\Collection::FEATURED);
+                                               Logger::debug('Added featured post', ['uri-id' => $item['uri-id'], 'contact' => $url]);
+                                               $new++;
+                                       } else {
+                                               Logger::debug('Post already had been featured', ['uri-id' => $item['uri-id'], 'contact' => $url]);
+                                               $old++;
+                                       }
+
+                                       $index = array_search($item['uri-id'], $old_featured);
+                                       if (!($index === false)) {
+                                               unset($old_featured[$index]);
+                                       }
+                               }
+                       }
+               }
+
+               foreach ($old_featured as $uri_id) {
+                       Post\Collection::remove($uri_id, Post\Collection::FEATURED);
+                       Logger::debug('Removed no longer featured post', ['uri-id' => $uri_id, 'contact' => $url]);
+               }
+
+               Logger::info('Fetched featured posts', ['new' => $new, 'old' => $old, 'contact' => $url]);
+       }
+
        /**
         * Fetches missing posts
         *
         * @param string $url         message URL
         * @param array  $child       activity array with the child of this message
         * @param string $relay_actor Relay actor
+        * @param int    $completion  Completion mode, see Receiver::COMPLETION_*
         * @return string fetched message URL
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '')
+       public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL): string
        {
                if (!empty($child['receiver'])) {
                        $uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
@@ -910,10 +1177,13 @@ class Processor
 
                if (!empty($relay_actor)) {
                        $ldactivity['thread-completion'] = $ldactivity['from-relay'] = Contact::getIdForURL($relay_actor);
+                       $ldactivity['completion-mode']   = Receiver::COMPLETION_RELAY;
                } elseif (!empty($child['thread-completion'])) {
                        $ldactivity['thread-completion'] = $child['thread-completion'];
+                       $ldactivity['completion-mode']   = $child['completion-mode'] ?? Receiver::COMPLETION_NONE;
                } else {
                        $ldactivity['thread-completion'] = Contact::getIdForURL($actor);
+                       $ldactivity['completion-mode']   = $completion;
                }
 
                if (!empty($child['type'])) {
@@ -938,7 +1208,7 @@ class Processor
         * @param string $id      object ID
         * @return boolean true if message is accepted
         */
-       private static function acceptIncomingMessage(array $activity, string $id)
+       private static function acceptIncomingMessage(array $activity, string $id): bool
        {
                if (empty($activity['as:object'])) {
                        Logger::info('No object field in activity - accepted', ['id' => $id]);
@@ -946,7 +1216,7 @@ class Processor
                }
 
                $replyto = JsonLD::fetchElement($activity['as:object'], 'as:inReplyTo', '@id');
-               $uriid = ItemURI::getIdByURI($replyto);
+               $uriid = ItemURI::getIdByURI($replyto ?? '');
                if (Post::exists(['uri-id' => $uriid])) {
                        Logger::info('Post is a reply to an existing post - accepted', ['id' => $id, 'uri-id' => $uriid, 'replyto' => $replyto]);
                        return true;
@@ -955,7 +1225,7 @@ class Processor
                $attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id');
                $authorid = Contact::getIdForURL($attributed_to);
 
-               $body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value'));
+               $body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value') ?? '');
 
                $messageTags = [];
                $tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []);
@@ -975,10 +1245,11 @@ class Processor
         * perform a "follow" request
         *
         * @param array $activity
+        * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function followUser($activity)
+       public static function followUser(array $activity)
        {
                $uid = User::getIdForURL($activity['object_id']);
                if (empty($uid)) {
@@ -996,8 +1267,10 @@ class Processor
                        Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
                }
 
-               $item = ['author-id' => Contact::getIdForURL($activity['actor']),
-                       'author-link' => $activity['actor']];
+               $item = [
+                       'author-id' => Contact::getIdForURL($activity['actor']),
+                       'author-link' => $activity['actor'],
+               ];
 
                // Ensure that the contact has got the right network type
                self::switchContact($item['author-id']);
@@ -1012,6 +1285,10 @@ class Processor
                        return;
                }
 
+               if ($result && DI::config()->get('system', 'transmit_pending_events') && ($owner['contact-type'] == Contact::TYPE_COMMUNITY)) {
+                       self::transmitPendingEvents($cid, $owner['uid']);
+               }
+
                if (empty($contact)) {
                        Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
                }
@@ -1019,13 +1296,40 @@ class Processor
                Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
        }
 
+       /**
+        * Transmit pending events to the new follower
+        *
+        * @param integer $cid Contact id
+        * @param integer $uid User id
+        * @return void
+        */
+       private static function transmitPendingEvents(int $cid, int $uid)
+       {
+               $account = DBA::selectFirst('account-user-view', ['ap-inbox', 'ap-sharedinbox'], ['id' => $cid]);
+               $inbox = $account['ap-sharedinbox'] ?: $account['ap-inbox'];
+
+               $events = DBA::select('event', ['id'], ["`uid` = ? AND `start` > ? AND `type` != ?", $uid, DateTimeFormat::utcNow(), 'birthday']);
+               while ($event = DBA::fetch($events)) {
+                       $post = Post::selectFirst(['id', 'uri-id', 'created'], ['event-id' => $event['id']]);
+                       if (empty($post)) {
+                               continue;
+                       }
+                       if (DI::config()->get('system', 'bulk_delivery')) {
+                               Post\Delivery::add($post['uri-id'], $uid, $inbox, $post['created'], Delivery::POST, [$cid]);
+                               Worker::add(PRIORITY_HIGH, 'APDelivery', '', 0, $inbox, 0);
+                       } else {
+                               Worker::add(PRIORITY_HIGH, 'APDelivery', Delivery::POST, $post['id'], $inbox, $uid, [$cid], $post['uri-id']);
+                       }
+               }
+       }
+
        /**
         * Update the given profile
         *
         * @param array $activity
         * @throws \Exception
         */
-       public static function updatePerson($activity)
+       public static function updatePerson(array $activity)
        {
                if (empty($activity['object_id'])) {
                        return;
@@ -1039,9 +1343,10 @@ class Processor
         * Delete the given profile
         *
         * @param array $activity
+        * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function deletePerson($activity)
+       public static function deletePerson(array $activity)
        {
                if (empty($activity['object_id']) || empty($activity['actor'])) {
                        Logger::info('Empty object id or actor.');
@@ -1062,6 +1367,54 @@ class Processor
                Logger::info('Deleted contact', ['object' => $activity['object_id']]);
        }
 
+       /**
+        * Blocks the user by the contact
+        *
+        * @param array $activity
+        * @return void
+        * @throws \Exception
+        */
+       public static function blockAccount(array $activity)
+       {
+               $cid = Contact::getIdForURL($activity['actor']);
+               if (empty($cid)) {
+                       return;
+               }
+
+               $uid = User::getIdForURL($activity['object_id']);
+               if (empty($uid)) {
+                       return;
+               }
+
+               Contact\User::setIsBlocked($cid, $uid, true);
+
+               Logger::info('Contact blocked user', ['contact' => $cid, 'user' => $uid]);
+       }
+
+       /**
+        * Unblocks the user by the contact
+        *
+        * @param array $activity
+        * @return void
+        * @throws \Exception
+        */
+       public static function unblockAccount(array $activity)
+       {
+               $cid = Contact::getIdForURL($activity['actor']);
+               if (empty($cid)) {
+                       return;
+               }
+
+               $uid = User::getIdForURL($activity['object_object']);
+               if (empty($uid)) {
+                       return;
+               }
+
+               Contact\User::setIsBlocked($cid, $uid, false);
+
+               Logger::info('Contact unblocked user', ['contact' => $cid, 'user' => $uid]);
+       }
+
        /**
         * Accept a follow request
         *
@@ -1069,7 +1422,7 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function acceptFollowUser($activity)
+       public static function acceptFollowUser(array $activity)
        {
                $uid = User::getIdForURL($activity['object_actor']);
                if (empty($uid)) {
@@ -1103,7 +1456,7 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function rejectFollowUser($activity)
+       public static function rejectFollowUser(array $activity)
        {
                $uid = User::getIdForURL($activity['object_actor']);
                if (empty($uid)) {
@@ -1136,7 +1489,7 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function undoActivity($activity)
+       public static function undoActivity(array $activity)
        {
                if (empty($activity['object_id'])) {
                        return;
@@ -1161,7 +1514,7 @@ class Processor
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function undoFollowUser($activity)
+       public static function undoFollowUser(array $activity)
        {
                $uid = User::getIdForURL($activity['object_object']);
                if (empty($uid)) {
@@ -1196,7 +1549,7 @@ class Processor
         * @param integer $cid Contact ID
         * @throws \Exception
         */
-       private static function switchContact($cid)
+       private static function switchContact(int $cid)
        {
                $contact = DBA::selectFirst('contact', ['network', 'url'], ['id' => $cid]);
                if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN]) || Contact::isLocal($contact['url'])) {
@@ -1216,7 +1569,7 @@ class Processor
         * @return array
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function getImplicitMentionList(array $parent)
+       private static function getImplicitMentionList(array $parent): array
        {
                $parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
 
@@ -1254,7 +1607,7 @@ class Processor
         * @param array $parent
         * @return string
         */
-       private static function removeImplicitMentionsFromBody(string $body, array $parent)
+       private static function removeImplicitMentionsFromBody(string $body, array $parent): string
        {
                if (DI::config()->get('system', 'disable_implicit_mentions')) {
                        return $body;