X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=ec2810277b4816dcf5e88333faea06141d66daa5;hb=5ec1891e0abc5ad4d1cecb1627af8e68ba6d1df8;hp=e36e2e7038778602adab9543cf7d013a60d67b61;hpb=f25c3f4619182f363ba87d738d6eb61fb6985ae6;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index e36e2e7038..9b6dd4d1a6 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,12 +21,13 @@
 
 namespace Friendica\Protocol\ActivityPub;
 
-use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 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
@@ -53,18 +55,14 @@ use Friendica\Util\Strings;
 class Processor
 {
 	/**
-	 * Converts mentions from Pleroma into the Friendica format
+	 * Extracts the tag character (#, @, !) from mention links
 	 *
 	 * @param string $body
-	 *
-	 * @return string converted body
+	 * @return string
 	 */
-	private static function convertMentions($body)
+	protected static function normalizeMentionLinks(string $body): string
 	{
-		$URLSearchString = "^\[\]";
-		$body = preg_replace("/\[url\=([$URLSearchString]*)\]([#@!])(.*?)\[\/url\]/ism", '$2[url=$1]$3[/url]', $body);
-
-		return $body;
+		return preg_replace('%\[url=([^\[\]]*)]([#@!])(.*?)\[/url]%ism', '$2[url=$1]$3[/url]', $body);
 	}
 
 	/**
@@ -95,17 +93,21 @@ class Processor
 	 *
 	 * @return string with replaced emojis
 	 */
-	private static function replaceEmojis($body, array $emojis)
+	private static function replaceEmojis(int $uri_id, $body, array $emojis)
 	{
 		$body = strtr($body,
 			array_combine(
 				array_column($emojis, 'name'),
 				array_map(function ($emoji) {
-					return '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
+					return '[emoji=' . $emoji['href'] . ']' . $emoji['name'] . '[/emoji]';
 				}, $emojis)
 			)
 		);
 
+		// We store the emoji here to be able to avoid storing it in the media
+		foreach ($emojis as $emoji) {
+			Post\Link::getByLink($uri_id, $emoji['href']);
+		}
 		return $body;
 	}
 
@@ -125,8 +127,9 @@ class Processor
 		$data = ['uri-id' => $uriid];
 		$data['type'] = Post\Media::UNKNOWN;
 		$data['url'] = $attachment['url'];
-		$data['mimetype'] = $attachment['mediaType'];
+		$data['mimetype'] = $attachment['mediaType'] ?? null;
 		$data['height'] = $attachment['height'] ?? null;
+		$data['width'] = $attachment['width'] ?? null;
 		$data['size'] = $attachment['size'] ?? null;
 		$data['preview'] = $attachment['image'] ?? null;
 		$data['description'] = $attachment['name'] ?? null;
@@ -151,6 +154,37 @@ class Processor
 		}
 	}
 
+	/**
+	 * Store attachment data
+	 *
+	 * @param array   $activity
+	 * @param array   $item
+	 */
+	private static function storeQuestion($activity, $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
 	 *
@@ -163,6 +197,10 @@ class Processor
 		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;
 		}
@@ -173,12 +211,47 @@ 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') {
+			$posts = Post::select(['event-id', 'uid'], ["`uri` = ? AND `event-id` > ?", $activity['id'], 0]);
+			while ($post = DBA::fetch($posts)) {
+				self::updateEvent($post['event-id'], $activity);
+			}
+		}
+	}
+
+	/**
+	 * Update an existing event
+	 *
+	 * @param int $event_id
+	 * @param array $activity
+	 */
+	private static function updateEvent(int $event_id, array $activity)
+	{
+		$event = DBA::selectFirst('event', [], ['id' => $event_id]);
+
+		$event['edited']   = DateTimeFormat::utc($activity['updated']);
+		$event['summary']  = HTML::toBBCode($activity['name']);
+		$event['desc']     = HTML::toBBCode($activity['content']);
+		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'];
+
+		Logger::info('Updating event', ['uri' => $activity['id'], 'id' => $event_id]);
+		Event::store($event);
 	}
 
 	/**
@@ -205,7 +278,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'] ?? '';
@@ -257,6 +330,8 @@ class Processor
 			$item['post-type'] = Item::PT_IMAGE;
 		} elseif ($activity['object_type'] == 'as:Page') {
 			$item['post-type'] = Item::PT_PAGE;
+		} elseif ($activity['object_type'] == 'as:Question') {
+			$item['post-type'] = Item::PT_POLL;
 		} elseif ($activity['object_type'] == 'as:Video') {
 			$item['post-type'] = Item::PT_VIDEO;
 		} else {
@@ -274,7 +349,7 @@ class Processor
 			} else {
 				// Store the original actor in the "causer" fields to enable the check for ignored or blocked contacts
 				$item['causer-link'] = $item['owner-link'];
-				$item['causer-id'] = $item['owner-id'];
+				$item['causer-id']   = $item['owner-id'];
 				Logger::info('Use actor as causer.', ['id' => $item['owner-id'], 'actor' => $item['owner-link']]);
 			}
 
@@ -287,8 +362,12 @@ class Processor
 
 		$item['uri'] = $activity['id'];
 
-		$item['created'] = DateTimeFormat::utc($activity['published']);
-		$item['edited'] = DateTimeFormat::utc($activity['updated']);
+		if (empty($activity['published']) || empty($activity['updated'])) {
+			DI::logger()->notice('published or updated keys are empty for activity', ['activity' => $activity, 'callstack' => System::callstack(10)]);
+		}
+
+		$item['created'] = DateTimeFormat::utc($activity['published'] ?? 'now');
+		$item['edited'] = DateTimeFormat::utc($activity['updated'] ?? 'now');
 		$guid = $activity['sc:identifier'] ?: self::getGUIDByURL($item['uri']);
 		$item['guid'] = $activity['diaspora:guid'] ?: $guid;
 
@@ -307,6 +386,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']);
@@ -380,33 +460,119 @@ class Processor
 	public static function createActivity($activity, $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
 	 *
 	 * @param array $activity Activity array
 	 * @param array $item
+	 *
+	 * @return int event id
 	 * @throws \Exception
 	 */
 	public static function createEvent($activity, $item)
 	{
-		$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['adjust']    = $activity['adjust'] ?? true;
 		$event['cid']       = $item['contact-id'];
 		$event['uid']       = $item['uid'];
 		$event['uri']       = $item['uri'];
@@ -419,14 +585,16 @@ class Processor
 		$event['direction'] = $item['direction'];
 		$event['source']    = $item['source'];
 
-		$condition = ['uri' => $item['uri'], 'uid' => $item['uid']];
-		$ev = DBA::selectFirst('event', ['id'], $condition);
+		$ev = DBA::selectFirst('event', ['id'], ['uri' => $item['uri'], 'uid' => $item['uid']]);
 		if (DBA::isResult($ev)) {
 			$event['id'] = $ev['id'];
 		}
 
 		$event_id = Event::store($event);
+
 		Logger::info('Event was stored', ['id' => $event_id]);
+
+		return $event_id;
 	}
 
 	/**
@@ -440,7 +608,7 @@ class Processor
 	private static function processContent($activity, $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'];
@@ -451,19 +619,22 @@ class Processor
 			$content = HTML::toBBCode($activity['content']);
 		}
 
+		$item['title'] = trim(BBCode::toPlaintext($item['title']));
+
 		if (!empty($activity['languages'])) {
 			$item['language'] = self::processLanguages($activity['languages']);
 		}
 
 		if (!empty($activity['emojis'])) {
-			$content = self::replaceEmojis($content, $activity['emojis']);
+			$content = self::replaceEmojis($item['uri-id'], $content, $activity['emojis']);
 		}
 
-		$content = self::convertMentions($content);
+		$content = self::addMentionLinks($content, $activity['tags']);
 
 		if (!empty($activity['source'])) {
 			$item['body'] = $activity['source'];
 			$item['raw-body'] = $content;
+			$item['body'] = Item::improveSharedDataInBody($item);
 		} else {
 			if (empty($activity['directmessage']) && ($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
 				$item_private = !in_array(0, $activity['item_receiver']);
@@ -486,6 +657,8 @@ class Processor
 		self::storeFromBody($item);
 		self::storeTags($item['uri-id'], $activity['tags']);
 
+		self::storeReceivers($item['uri-id'], $activity['receiver_urls'] ?? []);
+
 		$item['location'] = $activity['location'];
 
 		if (!empty($activity['latitude']) && !empty($activity['longitude'])) {
@@ -511,7 +684,7 @@ 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
@@ -530,6 +703,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)
+	{
+		// 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
 	 *
@@ -547,6 +770,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;
@@ -602,7 +830,33 @@ class Processor
 				continue;
 			}
 
-			if (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
+			if (!($item['isForum'] ?? false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT) && !Contact::isSharingByURL($activity['author'], $receiver)) {
+				if ($item['post-reason'] == Item::PR_BCC) {
+					Logger::info('Top level post via BCC from a non sharer, ignoring', ['uid' => $receiver, 'contact' => $item['contact-id']]);
+					continue;
+				}
+
+				if (
+					!empty($activity['thread-children-type'])
+					&& in_array($activity['thread-children-type'], Receiver::ACTIVITY_TYPES)
+					&& DI::pConfig()->get($receiver, 'system', 'accept_only_sharer') != Item::COMPLETION_LIKE
+				) {
+					Logger::info('Top level post from thread completion from a non sharer had been initiated via an activity, ignoring',
+						['type' => $activity['thread-children-type'], 'user' => $item['uid'], 'causer' => $item['causer-link'], 'author' => $activity['author'], 'url' => $item['uri']]);
+					continue;
+				}
+			}
+
+			$is_forum = false;
+
+			if ($receiver != 0) {
+				$user = User::getById($receiver, ['account-type']);
+				if (!empty($user['account-type'])) {
+					$is_forum = ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
+				}
+			}
+
+			if (!$is_forum && DI::pConfig()->get($receiver, 'system', 'accept_only_sharer') == Item::COMPLETION_NONE && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
 				$skip = !Contact::isSharingByURL($activity['author'], $receiver);
 
 				if ($skip && (($activity['type'] == 'as:Announce') || ($item['isForum'] ?? false))) {
@@ -618,7 +872,9 @@ class Processor
 			}
 
 			if (($item['gravity'] != GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) {
-				self::createEvent($activity, $item);
+				$event_id = self::createEvent($activity, $item);
+
+				$item = Event::getItemArrayForImportedId($event_id, $item);
 			}
 
 			$item_id = Item::insert($item);
@@ -688,6 +944,25 @@ class Processor
 		}
 	}
 
+	public static function storeReceivers(int $uriid, array $receivers)
+	{
+		foreach (['as:to' => Tag::TO, 'as:cc' => Tag::CC, 'as:bto' => Tag::BTO, 'as:bcc' => Tag::BCC] as $element => $type) {
+			if (!empty($receivers[$element])) {
+				foreach ($receivers[$element] as $receiver) {
+					if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
+						$name = Receiver::PUBLIC_COLLECTION;
+					} else {
+						$name = trim(parse_url($receiver, PHP_URL_PATH), '/');
+					}
+
+					$target = Tag::getTargetType($receiver);
+					Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]);
+					Tag::store($uriid, $type, $name, $receiver, $target);
+				}
+			}
+		}
+	}
+
 	/**
 	 * Creates an mail post
 	 *
@@ -737,7 +1012,7 @@ class Processor
 					$title = $matches[3];
 				}
 
-				$title = trim(HTML::toPlaintext(BBCode::convert($title, false, BBCode::API, true), 0));
+				$title = trim(BBCode::toPlaintext($title));
 
 				if (strlen($title) > 20) {
 					$title = substr($title, 0, 20) . '...';
@@ -751,16 +1026,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)
 	{
 		if (!empty($child['receiver'])) {
 			$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
@@ -824,10 +1176,17 @@ 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'])) {
+			$ldactivity['thread-children-type'] = $child['type'];
 		}
 
 		if (!empty($relay_actor) && !self::acceptIncomingMessage($ldactivity, $object['id'])) {
@@ -903,7 +1262,7 @@ class Processor
 		$cid = Contact::getIdForURL($activity['actor'], $uid);
 		if (!empty($cid)) {
 			self::switchContact($cid);
-			DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
+			Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
 		}
 
 		$item = ['author-id' => Contact::getIdForURL($activity['actor']),
@@ -922,13 +1281,44 @@ 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)) {
-			DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
+			Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
 		}
 
 		Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
 	}
 
+	/**
+	 * Transmit pending events to the new follower
+	 *
+	 * @param integer $cid
+	 * @param integer $uid
+	 * @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
 	 *
@@ -972,6 +1362,52 @@ class Processor
 		Logger::info('Deleted contact', ['object' => $activity['object_id']]);
 	}
 
+	/**
+	 * Blocks the user by the contact
+	 *
+	 * @param array $activity
+	 * @throws \Exception
+	 */
+	public static function blockAccount($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
+	 * @throws \Exception
+	 */
+	public static function unblockAccount($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
 	 *
@@ -1002,7 +1438,7 @@ class Processor
 		}
 
 		$condition = ['id' => $cid];
-		DBA::update('contact', $fields, $condition);
+		Contact::update($fields, $condition);
 		Logger::info('Accept contact request', ['contact' => $cid, 'user' => $uid]);
 	}
 
@@ -1028,9 +1464,12 @@ class Processor
 
 		self::switchContact($cid);
 
-		if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING])) {
+		$contact = Contact::getById($cid, ['rel']);
+		if ($contact['rel'] == Contact::SHARING) {
 			Contact::remove($cid);
 			Logger::info('Rejected contact request - contact removed', ['contact' => $cid, 'user' => $uid]);
+		} elseif ($contact['rel'] == Contact::FRIEND) {
+			Contact::update(['rel' => Contact::FOLLOWER], ['id' => $cid]);
 		} else {
 			Logger::info('Rejected contact request', ['contact' => $cid, 'user' => $uid]);
 		}
@@ -1093,7 +1532,7 @@ class Processor
 			return;
 		}
 
-		Contact::removeFollower($owner, $contact);
+		Contact::removeFollower($contact);
 		Logger::info('Undo following request', ['contact' => $cid, 'user' => $uid]);
 	}
 
@@ -1185,4 +1624,38 @@ class Processor
 
 		return implode('', $kept_mentions);
 	}
+
+	/**
+	 * Adds links to string mentions
+	 *
+	 * @param string $body
+	 * @param array  $tags
+	 * @return string
+	 */
+	protected static function addMentionLinks(string $body, array $tags): string
+	{
+		// This prevents links to be added again to Pleroma-style mention links
+		$body = self::normalizeMentionLinks($body);
+
+		$body = BBCode::performWithEscapedTags($body, ['url'], function ($body) use ($tags) {
+			foreach ($tags as $tag) {
+				if (empty($tag['name']) || empty($tag['type']) || empty($tag['href']) || !in_array($tag['type'], ['Mention', 'Hashtag'])) {
+					continue;
+				}
+
+				$hash = substr($tag['name'], 0, 1);
+				$name = substr($tag['name'], 1);
+				if (!in_array($hash, Tag::TAG_CHARACTER)) {
+					$hash = '';
+					$name = $tag['name'];
+				}
+
+				$body = str_replace($tag['name'], $hash . '[url=' . $tag['href'] . ']' . $name . '[/url]', $body);
+			}
+
+			return $body;
+		});
+
+		return $body;
+	}
 }