X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=38482d3ec95f83dab1191745305e794b49b824dc;hb=0d3aa681b4bec50c72e426c60cc5a22e4736d9e9;hp=6254bdf41b8d45e8424817acc822ff35b81dcba6;hpb=e555ea6aadaaaa178f108b313b728a7b6144b42f;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 6254bdf41b..38482d3ec9 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -31,7 +31,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
 use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
@@ -44,7 +43,6 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPSignature;
-use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
@@ -59,13 +57,16 @@ use Friendica\Util\XML;
  */
 class Transmitter
 {
+	const CACHEKEY_FEATURED = 'transmitter:getFeatured:';
+	const CACHEKEY_CONTACTS = 'transmitter:getContacts:';
+
 	/**
 	 * Add relay servers to the list of inboxes
 	 *
 	 * @param array $inboxes
 	 * @return array inboxes with added relay servers
 	 */
-	public static function addRelayServerInboxes(array $inboxes = [])
+	public static function addRelayServerInboxes(array $inboxes = []): array
 	{
 		foreach (Relay::getList(['inbox']) as $contact) {
 			$inboxes[$contact['inbox']] = $contact['inbox'];
@@ -80,7 +81,7 @@ class Transmitter
 	 * @param array $inboxes
 	 * @return array inboxes with added relay servers
 	 */
-	public static function addRelayServerInboxesForItem(int $item_id, array $inboxes = [])
+	public static function addRelayServerInboxesForItem(int $item_id, array $inboxes = []): array
 	{
 		$item = Post::selectFirst(['uid'], ['id' => $item_id]);
 		if (empty($item)) {
@@ -100,12 +101,12 @@ class Transmitter
 	}
 
 	/**
-	 * Subscribe to a relay
+	 * Subscribe to a relay and updates contact on success
 	 *
 	 * @param string $url Subscribe actor url
 	 * @return bool success
 	 */
-	public static function sendRelayFollow(string $url)
+	public static function sendRelayFollow(string $url): bool
 	{
 		$contact = Contact::getByURL($url);
 		if (empty($contact)) {
@@ -122,13 +123,13 @@ class Transmitter
 	}
 
 	/**
-	 * Unsubscribe from a relay
+	 * Unsubscribe from a relay and updates contact on success or forced
 	 *
 	 * @param string $url   Subscribe actor url
 	 * @param bool   $force Set the relay status as non follower even if unsubscribe hadn't worked
 	 * @return bool success
 	 */
-	public static function sendRelayUndoFollow(string $url, bool $force = false)
+	public static function sendRelayUndoFollow(string $url, bool $force = false): bool
 	{
 		$contact = Contact::getByURL($url);
 		if (empty($contact)) {
@@ -136,6 +137,7 @@ class Transmitter
 		}
 
 		$success = self::sendContactUndo($url, $contact['id'], 0);
+
 		if ($success || $force) {
 			Contact::update(['rel' => Contact::NOTHING], ['id' => $contact['id']]);
 		}
@@ -152,14 +154,13 @@ class Transmitter
 	 * @param integer $page      Page number
 	 * @param string  $requester URL of the requester
 	 * @param boolean $nocache   Wether to bypass caching
-	 *
 	 * @return array of owners
 	 * @throws \Exception
 	 */
-	public static function getContacts(array $owner, array $rel, string $module, int $page = null, string $requester = null, $nocache = false)
+	public static function getContacts(array $owner, array $rel, string $module, int $page = null, string $requester = null, bool $nocache = false): array
 	{
 		if (empty($page)) {
-			$cachekey = 'transmitter:getContacts:' . $module . ':'. $owner['uid'];
+			$cachekey = self::CACHEKEY_CONTACTS . $module . ':'. $owner['uid'];
 			$result = DI::cache()->get($cachekey);
 			if (!$nocache && !is_null($result)) {
 				return $result;
@@ -202,7 +203,7 @@ class Transmitter
 
 		if (!$show_contacts) {
 			if (!empty($cachekey)) {
-				DI::cache()->set($cachekey, $data, Duration::QUARTER_HOUR);
+				DI::cache()->set($cachekey, $data, Duration::DAY);
 			}
 
 			return $data;
@@ -230,7 +231,7 @@ class Transmitter
 		}
 
 		if (!empty($cachekey)) {
-			DI::cache()->set($cachekey, $data, Duration::QUARTER_HOUR);
+			DI::cache()->set($cachekey, $data, Duration::DAY);
 		}
 
 		return $data;
@@ -243,21 +244,12 @@ class Transmitter
 	 * @param integer $page      Page number
 	 * @param string  $requester URL of requesting account
 	 * @param boolean $nocache   Wether to bypass caching
-	 *
 	 * @return array of posts
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function getOutbox(array $owner, int $page = null, string $requester = '', $nocache = false)
+	public static function getOutbox(array $owner, int $page = null, string $requester = '', bool $nocache = false): array
 	{
-		if (empty($page)) {
-			$cachekey = 'transmitter:getOutbox:' . $owner['uid'];
-			$result = DI::cache()->get($cachekey);
-			if (!$nocache && !is_null($result)) {
-				return $result;
-			}
-		}
-
 		$condition = ['private' => [Item::PUBLIC, Item::UNLISTED]];
 
 		if (!empty($requester)) {
@@ -271,22 +263,23 @@ class Transmitter
 			}
 		}
 
-		$condition = array_merge($condition,
-			['uid'           => $owner['uid'],
+		$condition = array_merge($condition, [
+			'uid'           => $owner['uid'],
 			'author-id'      => Contact::getIdForURL($owner['url'], 0, false),
 			'gravity'        => [GRAVITY_PARENT, GRAVITY_COMMENT],
 			'network'        => Protocol::FEDERATED,
 			'parent-network' => Protocol::FEDERATED,
 			'origin'         => true,
 			'deleted'        => false,
-			'visible'        => true]);
+			'visible'        => true
+		]);
 
-		$count = Post::count($condition);
+		$apcontact = APContact::getByURL($owner['url']);
 
 		$data = ['@context' => ActivityPub::CONTEXT];
 		$data['id'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
 		$data['type'] = 'OrderedCollection';
-		$data['totalItems'] = $count;
+		$data['totalItems'] = $apcontact['statuses_count'] ?? 0;
 
 		if (!empty($page)) {
 			$data['id'] .= '?' . http_build_query(['page' => $page]);
@@ -314,15 +307,17 @@ class Transmitter
 				$data['next'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
 			}
 
+			// Fix the cached total item count when it is lower than the real count
+			$total = (($page - 1) * 20) + $data['totalItems'];
+			if ($total > $data['totalItems']) {
+				$data['totalItems'] = $total;
+			}
+
 			$data['partOf'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
 
 			$data['orderedItems'] = $list;
 		}
 
-		if (!empty($cachekey)) {
-			DI::cache()->set($cachekey, $data, Duration::QUARTER_HOUR);
-		}
-
 		return $data;
 	}
 
@@ -337,22 +332,23 @@ class Transmitter
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function getFeatured(array $owner, int $page = null, $nocache = false)
+	public static function getFeatured(array $owner, int $page = null, bool $nocache = false): array
 	{
-		$owner_cid = Contact::getIdForURL($owner['url'], 0, false);
 		if (empty($page)) {
-			$cachekey = 'transmitter:getFeatured:' . $owner_cid;
+			$cachekey = self::CACHEKEY_FEATURED . $owner['uid'];
 			$result = DI::cache()->get($cachekey);
 			if (!$nocache && !is_null($result)) {
 				return $result;
 			}
 		}
 
+		$owner_cid = Contact::getIdForURL($owner['url'], 0, false);
+
 		$condition = ["`uri-id` IN (SELECT `uri-id` FROM `collection-view` WHERE `cid` = ? AND `type` = ?)",
 			$owner_cid, Post\Collection::FEATURED];
 
-		$condition = DBA::mergeConditions($condition,
-			['uid'           => $owner['uid'],
+		$condition = DBA::mergeConditions($condition, [
+			'uid'           => $owner['uid'],
 			'author-id'      => $owner_cid,
 			'private'        => [Item::PUBLIC, Item::UNLISTED],
 			'gravity'        => [GRAVITY_PARENT, GRAVITY_COMMENT],
@@ -360,7 +356,8 @@ class Transmitter
 			'parent-network' => Protocol::FEDERATED,
 			'origin'         => true,
 			'deleted'        => false,
-			'visible'        => true]);
+			'visible'        => true
+		]);
 
 		$count = Post::count($condition);
 
@@ -403,7 +400,7 @@ class Transmitter
 		$data['orderedItems'] = $list;
 
 		if (!empty($cachekey)) {
-			DI::cache()->set($cachekey, $data, Duration::QUARTER_HOUR);
+			DI::cache()->set($cachekey, $data, Duration::DAY);
 		}
 
 		return $data;
@@ -414,11 +411,13 @@ class Transmitter
 	 *
 	 * @return array with service data
 	 */
-	private static function getService()
+	private static function getService(): array
 	{
-		return ['type' => 'Service',
+		return [
+			'type' => 'Service',
 			'name' =>  FRIENDICA_PLATFORM . " '" . FRIENDICA_CODENAME . "' " . FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
-			'url' => DI::baseUrl()->get()];
+			'url' => DI::baseUrl()->get()
+		];
 	}
 
 	/**
@@ -533,7 +532,7 @@ class Transmitter
 	 * @return array
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function getDeletedUser($username)
+	public static function getDeletedUser(string $username): array
 	{
 		return [
 			'@context' => ActivityPub::CONTEXT,
@@ -555,7 +554,7 @@ class Transmitter
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function fetchPermissionBlockFromThreadParent(array $item, bool $is_forum_thread)
+	private static function fetchPermissionBlockFromThreadParent(array $item, bool $is_forum_thread): array
 	{
 		if (empty($item['thr-parent-id'])) {
 			return [];
@@ -602,7 +601,7 @@ class Transmitter
 	 * @param integer $item_id
 	 * @return boolean "true" if the post is from ActivityPub
 	 */
-	private static function isAPPost(int $item_id)
+	private static function isAPPost(int $item_id): bool
 	{
 		if (empty($item_id)) {
 			return false;
@@ -622,7 +621,7 @@ class Transmitter
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function createPermissionBlockForItem($item, $blindcopy, $last_id = 0)
+	private static function createPermissionBlockForItem(array $item, bool $blindcopy, int $last_id = 0): array
 	{
 		if ($last_id == 0) {
 			$last_id = $item['id'];
@@ -649,7 +648,7 @@ class Transmitter
 		}
 
 		$parent = Post::selectFirst(['causer-link', 'post-reason'], ['id' => $item['parent']]);
-		if (($parent['post-reason'] == Item::PR_ANNOUNCEMENT) && !empty($parent['causer-link'])) {
+		if (!empty($parent) && ($parent['post-reason'] == Item::PR_ANNOUNCEMENT) && !empty($parent['causer-link'])) {
 			$profile = APContact::getByURL($parent['causer-link'], false);
 			$is_forum_thread = isset($profile['type']) && $profile['type'] == 'Group';
 		} else {
@@ -766,7 +765,7 @@ class Transmitter
 								$data['to'][] = $profile['url'];
 							} else {
 								$data['cc'][] = $profile['url'];
-								if (($item['private'] != Item::PRIVATE) && !empty($actor_profile['followers'])&& !$is_forum_thread) {
+								if (($item['private'] != Item::PRIVATE) && !empty($actor_profile['followers']) && (!$exclusive || !$is_forum_thread)) {
 									$data['cc'][] = $actor_profile['followers'];
 								}
 							}
@@ -854,10 +853,9 @@ class Transmitter
 	 * Check if an inbox is archived
 	 *
 	 * @param string $url Inbox url
-	 *
 	 * @return boolean "true" if inbox is archived
 	 */
-	public static function archivedInbox($url)
+	public static function archivedInbox(string $url): bool
 	{
 		return DBA::exists('inbox-status', ['url' => $url, 'archive' => true]);
 	}
@@ -865,12 +863,12 @@ class Transmitter
 	/**
 	 * Check if a given contact should be delivered via AP
 	 *
-	 * @param array $contact
-	 * @param array $networks
-	 * @return bool
+	 * @param array $contact Contact array
+	 * @param array $networks Array with networks
+	 * @return bool Whether the used protocol matches ACTIVITYPUB
 	 * @throws Exception
 	 */
-	private static function isAPContact(array $contact, array $networks)
+	private static function isAPContact(array $contact, array $networks): bool
 	{
 		if (in_array($contact['network'], $networks) || ($contact['protocol'] == Protocol::ACTIVITYPUB)) {
 			return true;
@@ -885,12 +883,11 @@ class Transmitter
 	 * @param integer $uid      User ID
 	 * @param boolean $personal fetch personal inboxes
 	 * @param boolean $all_ap   Retrieve all AP enabled inboxes
-	 *
 	 * @return array of follower inboxes
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function fetchTargetInboxesforUser($uid, $personal = false, bool $all_ap = false)
+	public static function fetchTargetInboxesforUser(int $uid, bool $personal = false, bool $all_ap = false): array
 	{
 		$inboxes = [];
 
@@ -911,7 +908,13 @@ class Transmitter
 			$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
 		}
 
-		$condition = ['uid' => $uid, 'archive' => false, 'pending' => false, 'blocked' => false, 'network' => Protocol::FEDERATED];
+		$condition = [
+			'uid' => $uid,
+			'archive' => false,
+			'pending' => false,
+			'blocked' => false,
+			'network' => Protocol::FEDERATED,
+		];
 
 		if (!empty($uid)) {
 			$condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
@@ -959,7 +962,7 @@ class Transmitter
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function fetchTargetInboxes($item, $uid, $personal = false, $last_id = 0)
+	public static function fetchTargetInboxes(array $item, int $uid, bool $personal = false, int $last_id = 0): array
 	{
 		$permissions = self::createPermissionBlockForItem($item, true, $last_id);
 		if (empty($permissions)) {
@@ -1018,12 +1021,11 @@ class Transmitter
 	/**
 	 * Creates an array in the structure of the item table for a given mail id
 	 *
-	 * @param integer $mail_id
-	 *
+	 * @param integer $mail_id Mail id
 	 * @return array
 	 * @throws \Exception
 	 */
-	public static function ItemArrayFromMail($mail_id, $use_title = false)
+	public static function getItemArrayFromMail(int $mail_id, bool $use_title = false): array
 	{
 		$mail = DBA::selectFirst('mail', [], ['id' => $mail_id]);
 		if (!DBA::isResult($mail)) {
@@ -1075,9 +1077,9 @@ class Transmitter
 	 * @return array of activity
 	 * @throws \Exception
 	 */
-	public static function createActivityFromMail($mail_id, $object_mode = false)
+	public static function createActivityFromMail(int $mail_id, bool $object_mode = false): array
 	{
-		$mail = self::ItemArrayFromMail($mail_id);
+		$mail = self::getItemArrayFromMail($mail_id);
 		if (empty($mail)) {
 			return [];
 		}
@@ -1129,18 +1131,17 @@ class Transmitter
 	/**
 	 * Returns the activity type of a given item
 	 *
-	 * @param array $item
-	 *
+	 * @param array $item Item array
 	 * @return string with activity type
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function getTypeOfItem($item)
+	private static function getTypeOfItem(array $item): string
 	{
 		$reshared = false;
 
 		// Only check for a reshare, if it is a real reshare and no quoted reshare
-		if (strpos($item['body'], "[share") === 0) {
+		if (strpos($item['body'], '[share') === 0) {
 			$announce = self::getAnnounceArray($item);
 			$reshared = !empty($announce);
 		}
@@ -1179,15 +1180,14 @@ class Transmitter
 	/**
 	 * Creates the activity or fetches it from the cache
 	 *
-	 * @param integer $item_id
+	 * @param integer $item_id Item id
 	 * @param boolean $force Force new cache entry
-	 *
-	 * @return array with the activity
+	 * @return array|false activity or false on failure
 	 * @throws \Exception
 	 */
-	public static function createCachedActivityFromItem($item_id, $force = false)
+	public static function createCachedActivityFromItem(int $item_id, bool $force = false, bool $object_mode = false)
 	{
-		$cachekey = 'APDelivery:createActivity:' . $item_id;
+		$cachekey = 'APDelivery:createActivity:' . $item_id . ':' . (int)$object_mode;
 
 		if (!$force) {
 			$data = DI::cache()->get($cachekey);
@@ -1196,7 +1196,7 @@ class Transmitter
 			}
 		}
 
-		$data = self::createActivityFromItem($item_id);
+		$data = self::createActivityFromItem($item_id, $object_mode);
 
 		DI::cache()->set($cachekey, $data, Duration::QUARTER_HOUR);
 		return $data;
@@ -1207,7 +1207,6 @@ class Transmitter
 	 *
 	 * @param integer $item_id
 	 * @param boolean $object_mode Is the activity item is used inside another object?
-	 *
 	 * @return false|array
 	 * @throws \Exception
 	 */
@@ -1225,30 +1224,22 @@ class Transmitter
 		}
 
 		if (!$item['deleted']) {
-			$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
-			$conversation = DBA::selectFirst('conversation', ['source'], $condition);
-			if (!$item['origin'] && DBA::isResult($conversation)) {
-				$data = json_decode($conversation['source'], true);
-				if (!empty($data['type'])) {
-					if (in_array($data['type'], ['Create', 'Update'])) {
-						if ($object_mode) {
-							unset($data['@context']);
-							unset($data['signature']);
-						}
-						Logger::info('Return stored conversation', ['item' => $item_id]);
-						return $data;
-					} elseif (in_array('as:' . $data['type'], Receiver::CONTENT_TYPES)) {
-						if (!empty($data['@context'])) {
-							$context = $data['@context'];
-							unset($data['@context']);
-						}
-						unset($data['actor']);
-						$object = $data;
-					}
+			$data = Post\Activity::getByURIId($item['uri-id']);
+			if (!$item['origin'] && !empty($data)) {
+				if ($object_mode) {
+					unset($data['@context']);
+					unset($data['signature']);
 				}
+				Logger::info('Return stored conversation', ['item' => $item_id]);
+				return $data;
 			}
 		}
 
+		if (!$item['origin'] && empty($object)) {
+			Logger::debug('Post is not ours and is not stored', ['id' => $item_id, 'uri-id' => $item['uri-id']]);
+			return false;
+		}
+
 		$type = self::getTypeOfItem($item);
 
 		if (!$object_mode) {
@@ -1264,7 +1255,7 @@ class Transmitter
 		}
 
 		if ($type == 'Delete') {
-			$data['id'] = Item::newURI($item['uid'], $item['guid']) . '/' . $type;;
+			$data['id'] = Item::newURI($item['guid']) . '/' . $type;;
 		} elseif (($item['gravity'] == GRAVITY_ACTIVITY) && ($type != 'Undo')) {
 			$data['id'] = $item['uri'];
 		} else {
@@ -1331,11 +1322,10 @@ class Transmitter
 	/**
 	 * Creates a location entry for a given item array
 	 *
-	 * @param array $item
-	 *
+	 * @param array $item Item array
 	 * @return array with location array
 	 */
-	private static function createLocation($item)
+	private static function createLocation(array $item): array
 	{
 		$location = ['type' => 'Place'];
 
@@ -1365,12 +1355,12 @@ class Transmitter
 	/**
 	 * Returns a tag array for a given item array
 	 *
-	 * @param array $item
-	 *
+	 * @param array  $item      Item array
+	 * @param string $quote_url Url of the attached quote link
 	 * @return array of tags
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function createTagList($item)
+	private static function createTagList(array $item, string $quote_url): array
 	{
 		$tags = [];
 
@@ -1400,6 +1390,17 @@ class Transmitter
 			$tags[] = ['type' => 'Mention', 'href' => $announce['actor']['url'], 'name' => '@' . $announce['actor']['addr']];
 		}
 
+		// @see https://codeberg.org/fediverse/fep/src/branch/main/feps/fep-e232.md
+		if (!empty($quote_url)) {
+			// Currently deactivated because of compatibility issues with Pleroma
+			//$tags[] = [
+			//	'type'      => 'Link',
+			//	'mediaType' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+			//	'href'      => $quote_url,
+			//	'name'      => '♲ ' . BBCode::convertForUriId($item['uri-id'], $quote_url, BBCode::ACTIVITYPUB)
+			//];
+		}
+
 		return $tags;
 	}
 
@@ -1407,51 +1408,39 @@ class Transmitter
 	 * Adds attachment data to the JSON document
 	 *
 	 * @param array  $item Data of the item that is to be posted
-	 * @param string $type Object type
 	 *
 	 * @return array with attachment data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function createAttachmentList($item, $type)
+	private static function createAttachmentList(array $item): array
 	{
 		$attachments = [];
 
-		$uriids = [$item['uri-id']];
-		$shared = BBCode::fetchShareAttributes($item['body']);
-		if (!empty($shared['guid'])) {
-			$shared_item = Post::selectFirst(['uri-id'], ['guid' => $shared['guid']]);
-			if (!empty($shared_item['uri-id'])) {
-				$uriids[] = $shared_item['uri-id'];
-			}
-		}
-
 		$urls = [];
-		foreach ($uriids as $uriid) {
-			foreach (Post\Media::getByURIId($uriid, [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO, Post\Media::DOCUMENT, Post\Media::TORRENT]) as $attachment) {
-				if (in_array($attachment['url'], $urls)) {
-					continue;
-				}
-				$urls[] = $attachment['url'];
-
-				$attach = ['type' => 'Document',
-					'mediaType' => $attachment['mimetype'],
-					'url' => $attachment['url'],
-					'name' => $attachment['description']];
+		foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO, Post\Media::DOCUMENT, Post\Media::TORRENT]) as $attachment) {
+			if (in_array($attachment['url'], $urls)) {
+				continue;
+			}
+			$urls[] = $attachment['url'];
 
-				if (!empty($attachment['height'])) {
-					$attach['height'] = $attachment['height'];
-				}
+			$attach = ['type' => 'Document',
+				'mediaType' => $attachment['mimetype'],
+				'url' => $attachment['url'],
+				'name' => $attachment['description']];
 
-				if (!empty($attachment['width'])) {
-					$attach['width'] = $attachment['width'];
-				}
+			if (!empty($attachment['height'])) {
+				$attach['height'] = $attachment['height'];
+			}
 
-				if (!empty($attachment['preview'])) {
-					$attach['image'] = $attachment['preview'];
-				}
+			if (!empty($attachment['width'])) {
+				$attach['width'] = $attachment['width'];
+			}
 
-				$attachments[] = $attach;
+			if (!empty($attachment['preview'])) {
+				$attach['image'] = $attachment['preview'];
 			}
+
+			$attachments[] = $attach;
 		}
 
 		return $attachments;
@@ -1464,7 +1453,7 @@ class Transmitter
 	 * @return string Replaced mention
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function mentionAddrCallback($match)
+	private static function mentionAddrCallback(array $match): string
 	{
 		if (empty($match[1])) {
 			return '';
@@ -1481,11 +1470,10 @@ class Transmitter
 	/**
 	 * Remove image elements since they are added as attachment
 	 *
-	 * @param string $body
-	 *
+	 * @param string $body HTML code
 	 * @return string with removed images
 	 */
-	private static function removePictures($body)
+	private static function removePictures(string $body): string
 	{
 		// Simplify image codes
 		$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
@@ -1511,36 +1499,14 @@ class Transmitter
 		return $body;
 	}
 
-	/**
-	 * Fetches the "context" value for a givem item array from the "conversation" table
-	 *
-	 * @param array $item
-	 *
-	 * @return string with context url
-	 * @throws \Exception
-	 */
-	private static function fetchContextURLForItem($item)
-	{
-		$conversation = DBA::selectFirst('conversation', ['conversation-href', 'conversation-uri'], ['item-uri' => $item['parent-uri']]);
-		if (DBA::isResult($conversation) && !empty($conversation['conversation-href'])) {
-			$context_uri = $conversation['conversation-href'];
-		} elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
-			$context_uri = $conversation['conversation-uri'];
-		} else {
-			$context_uri = $item['parent-uri'] . '#context';
-		}
-		return $context_uri;
-	}
-
 	/**
 	 * Returns if the post contains sensitive content ("nsfw")
 	 *
-	 * @param integer $uri_id
-	 *
-	 * @return boolean
+	 * @param integer $uri_id URI id
+	 * @return boolean Whether URI id was found
 	 * @throws \Exception
 	 */
-	private static function isSensitive($uri_id)
+	private static function isSensitive(int $uri_id): bool
 	{
 		return DBA::exists('tag-view', ['uri-id' => $uri_id, 'name' => 'nsfw', 'type' => Tag::HASHTAG]);
 	}
@@ -1548,12 +1514,11 @@ class Transmitter
 	/**
 	 * Creates event data
 	 *
-	 * @param array $item
-	 *
+	 * @param array $item Item array
 	 * @return array with the event data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function createEvent($item)
+	private static function createEvent(array $item): array
 	{
 		$event = [];
 		$event['name'] = $item['event-summary'];
@@ -1579,12 +1544,11 @@ class Transmitter
 	 * Creates a note/article object array
 	 *
 	 * @param array $item
-	 *
 	 * @return array with the object data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function createNote($item)
+	public static function createNote(array $item): array
 	{
 		if (empty($item)) {
 			return [];
@@ -1646,7 +1610,10 @@ class Transmitter
 		$data['url'] = $link ?? $item['plink'];
 		$data['attributedTo'] = $item['author-link'];
 		$data['sensitive'] = self::isSensitive($item['uri-id']);
-		$data['context'] = self::fetchContextURLForItem($item);
+
+		if (!empty($item['conversation']) && ($item['conversation'] != './')) {
+			$data['conversation'] = $data['context'] = $item['conversation'];
+		}
 
 		if (!empty($item['title'])) {
 			$data['name'] = BBCode::toPlaintext($item['title'], false);
@@ -1695,6 +1662,12 @@ class Transmitter
 
 			$body = BBCode::setMentionsToNicknames($body);
 
+			$shared = BBCode::fetchShareAttributes($body);
+			if (!empty($shared['link']) && !empty($shared['guid']) && !empty($shared['comment'])) {
+				$body = self::replaceSharedData($body);
+				$data['quoteUrl'] = $shared['link'];
+			}
+
 			$data['content'] = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
 		}
 
@@ -1704,6 +1677,12 @@ class Transmitter
 		$language = self::getLanguage($item);
 		if (!empty($language)) {
 			$richbody = BBCode::setMentionsToNicknames($item['body'] ?? '');
+
+			$shared = BBCode::fetchShareAttributes($richbody);
+			if (!empty($shared['link']) && !empty($shared['guid']) && !empty($shared['comment'])) {
+				$richbody = self::replaceSharedData($richbody);
+			}
+
 			$richbody = BBCode::removeAttachment($richbody);
 
 			$data['contentMap'][$language] = BBCode::convertForUriId($item['uri-id'], $richbody, BBCode::EXTERNAL);
@@ -1715,8 +1694,8 @@ class Transmitter
 			$data['diaspora:comment'] = $item['signed_text'];
 		}
 
-		$data['attachment'] = self::createAttachmentList($item, $type);
-		$data['tag'] = self::createTagList($item);
+		$data['attachment'] = self::createAttachmentList($item);
+		$data['tag'] = self::createTagList($item, $data['quoteUrl'] ?? '');  
 
 		if (empty($data['location']) && (!empty($item['coord']) || !empty($item['location']))) {
 			$data['location'] = self::createLocation($item);
@@ -1731,14 +1710,29 @@ class Transmitter
 		return $data;
 	}
 
+	/**
+	 * Replace the share block with a link
+	 *
+	 * @param string $body
+	 * @return string
+	 */
+	private static function replaceSharedData(string $body): string
+	{
+		return BBCode::convertShare(
+			$body,
+			function (array $attributes) {
+				return '♲ ' . $attributes['link'];
+			}
+		);
+	}
+
 	/**
 	 * Fetches the language from the post, the user or the system.
 	 *
 	 * @param array $item
-	 *
 	 * @return string language string
 	 */
-	private static function getLanguage(array $item)
+	private static function getLanguage(array $item): string
 	{
 		// Try to fetch the language from the post itself
 		if (!empty($item['language'])) {
@@ -1763,74 +1757,71 @@ class Transmitter
 	/**
 	 * Creates an an "add tag" entry
 	 *
-	 * @param array $item
-	 * @param array $data activity data
-	 *
+	 * @param array $item Item array
+	 * @param array $activity activity data
 	 * @return array with activity data for adding tags
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function createAddTag($item, $data)
+	private static function createAddTag(array $item, array $activity): array
 	{
 		$object = XML::parseString($item['object']);
-		$target = XML::parseString($item["target"]);
+		$target = XML::parseString($item['target']);
 
-		$data['diaspora:guid'] = $item['guid'];
-		$data['actor'] = $item['author-link'];
-		$data['target'] = (string)$target->id;
-		$data['summary'] = BBCode::toPlaintext($item['body']);
-		$data['object'] = ['id' => (string)$object->id, 'type' => 'tag', 'name' => (string)$object->title, 'content' => (string)$object->content];
+		$activity['diaspora:guid'] = $item['guid'];
+		$activity['actor'] = $item['author-link'];
+		$activity['target'] = (string)$target->id;
+		$activity['summary'] = BBCode::toPlaintext($item['body']);
+		$activity['object'] = ['id' => (string)$object->id, 'type' => 'tag', 'name' => (string)$object->title, 'content' => (string)$object->content];
 
-		return $data;
+		return $activity;
 	}
 
 	/**
 	 * Creates an announce object entry
 	 *
-	 * @param array $item
-	 * @param array $data activity data
-	 *
+	 * @param array $item Item array
+	 * @param array $activity activity data
 	 * @return array with activity data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function createAnnounce($item, $data)
+	private static function createAnnounce(array $item, array $activity): array
 	{
 		$orig_body = $item['body'];
 		$announce = self::getAnnounceArray($item);
 		if (empty($announce)) {
-			$data['type'] = 'Create';
-			$data['object'] = self::createNote($item);
-			return $data;
+			$activity['type'] = 'Create';
+			$activity['object'] = self::createNote($item);
+			return $activity;
 		}
 
 		if (empty($announce['comment'])) {
 			// Pure announce, without a quote
-			$data['type'] = 'Announce';
-			$data['object'] = $announce['object']['uri'];
-			return $data;
+			$activity['type'] = 'Announce';
+			$activity['object'] = $announce['object']['uri'];
+			return $activity;
 		}
 
 		// Quote
-		$data['type'] = 'Create';
+		$activity['type'] = 'Create';
 		$item['body'] = $announce['comment'] . "\n" . $announce['object']['plink'];
-		$data['object'] = self::createNote($item);
+		$activity['object'] = self::createNote($item);
 
 		/// @todo Finally descide how to implement this in AP. This is a possible way:
-		$data['object']['attachment'][] = self::createNote($announce['object']);
+		$activity['object']['attachment'][] = self::createNote($announce['object']);
 
-		$data['object']['source']['content'] = $orig_body;
-		return $data;
+		$activity['object']['source']['content'] = $orig_body;
+		return $activity;
 	}
 
 	/**
 	 * Return announce related data if the item is an annunce
 	 *
 	 * @param array $item
-	 *
-	 * @return array
+	 * @return array Announcement array
 	 */
-	public static function getAnnounceArray($item)
+	public static function getAnnounceArray(array $item): array
 	{
 		$reshared = Item::getShareArray($item);
 		if (empty($reshared['guid'])) {
@@ -1857,11 +1848,10 @@ class Transmitter
 	/**
 	 * Checks if the provided item array is an announce
 	 *
-	 * @param array $item
-	 *
-	 * @return boolean
+	 * @param array $item Item array
+	 * @return boolean Whether item is an announcement
 	 */
-	public static function isAnnounce($item)
+	public static function isAnnounce(array $item): bool
 	{
 		if (!empty($item['verb']) && ($item['verb'] == Activity::ANNOUNCE)) {
 			return true;
@@ -1882,7 +1872,7 @@ class Transmitter
 	 *
 	 * @return bool|string activity id
 	 */
-	public static function activityIDFromContact($cid)
+	public static function activityIDFromContact(int $cid)
 	{
 		$contact = DBA::selectFirst('contact', ['uid', 'id', 'created'], ['id' => $cid]);
 		if (!DBA::isResult($contact)) {
@@ -1900,17 +1890,17 @@ class Transmitter
 	 * @param integer $uid           User ID
 	 * @param string  $inbox         Target inbox
 	 * @param integer $suggestion_id Suggestion ID
-	 *
 	 * @return boolean was the transmission successful?
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function sendContactSuggestion($uid, $inbox, $suggestion_id)
+	public static function sendContactSuggestion(int $uid, string $inbox, int $suggestion_id): bool
 	{
 		$owner = User::getOwnerDataById($uid);
 
 		$suggestion = DI::fsuggest()->selectOneById($suggestion_id);
 
-		$data = ['@context' => ActivityPub::CONTEXT,
+		$data = [
+			'@context' => ActivityPub::CONTEXT,
 			'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
 			'type' => 'Announce',
 			'actor' => $owner['url'],
@@ -1918,7 +1908,8 @@ class Transmitter
 			'content' => $suggestion->note,
 			'instrument' => self::getService(),
 			'to' => [ActivityPub::PUBLIC_COLLECTION],
-			'cc' => []];
+			'cc' => []
+		];
 
 		$signed = LDSignature::sign($data, $owner);
 
@@ -1931,15 +1922,15 @@ class Transmitter
 	 *
 	 * @param integer $uid   User ID
 	 * @param string  $inbox Target inbox
-	 *
 	 * @return boolean was the transmission successful?
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function sendProfileRelocation($uid, $inbox)
+	public static function sendProfileRelocation(int $uid, string $inbox): bool
 	{
 		$owner = User::getOwnerDataById($uid);
 
-		$data = ['@context' => ActivityPub::CONTEXT,
+		$data = [
+			'@context' => ActivityPub::CONTEXT,
 			'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
 			'type' => 'dfrn:relocate',
 			'actor' => $owner['url'],
@@ -1947,7 +1938,8 @@ class Transmitter
 			'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
 			'instrument' => self::getService(),
 			'to' => [ActivityPub::PUBLIC_COLLECTION],
-			'cc' => []];
+			'cc' => []
+		];
 
 		$signed = LDSignature::sign($data, $owner);
 
@@ -1960,11 +1952,10 @@ class Transmitter
 	 *
 	 * @param integer $uid   User ID
 	 * @param string  $inbox Target inbox
-	 *
 	 * @return boolean was the transmission successful?
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function sendProfileDeletion($uid, $inbox)
+	public static function sendProfileDeletion(int $uid, string $inbox): bool
 	{
 		$owner = User::getOwnerDataById($uid);
 
@@ -1999,7 +1990,6 @@ class Transmitter
 	 *
 	 * @param integer $uid   User ID
 	 * @param string  $inbox Target inbox
-	 *
 	 * @return boolean was the transmission successful?
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws HTTPException\NotFoundException
@@ -2032,17 +2022,18 @@ class Transmitter
 	 * @param string  $activity Type name
 	 * @param string  $target   Target profile
 	 * @param integer $uid      User ID
+	 * @param string  $id Activity-identifier
 	 * @return bool
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @throws \Exception
 	 */
-	public static function sendActivity($activity, $target, $uid, $id = '')
+	public static function sendActivity(string $activity, string $target, int $uid, string $id = ''): bool
 	{
 		$profile = APContact::getByURL($target);
 		if (empty($profile['inbox'])) {
 			Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
-			return;
+			return false;
 		}
 
 		$owner = User::getOwnerDataById($uid);
@@ -2051,13 +2042,15 @@ class Transmitter
 			$id = DI::baseUrl() . '/activity/' . System::createGUID();
 		}
 
-		$data = ['@context' => ActivityPub::CONTEXT,
+		$data = [
+			'@context' => ActivityPub::CONTEXT,
 			'id' => $id,
 			'type' => $activity,
 			'actor' => $owner['url'],
 			'object' => $profile['url'],
 			'instrument' => self::getService(),
-			'to' => [$profile['url']]];
+			'to' => [$profile['url']],
+		];
 
 		Logger::info('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid);
 
@@ -2077,12 +2070,12 @@ class Transmitter
 	 * @throws \ImagickException
 	 * @throws \Exception
 	 */
-	public static function sendFollowObject($object, $target, $uid = 0)
+	public static function sendFollowObject(string $object, string $target, int $uid = 0): bool
 	{
 		$profile = APContact::getByURL($target);
 		if (empty($profile['inbox'])) {
 			Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
-			return;
+			return false;
 		}
 
 		if (empty($uid)) {
@@ -2104,13 +2097,15 @@ class Transmitter
 
 		$owner = User::getOwnerDataById($uid);
 
-		$data = ['@context' => ActivityPub::CONTEXT,
+		$data = [
+			'@context' => ActivityPub::CONTEXT,
 			'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
 			'type' => 'Follow',
 			'actor' => $owner['url'],
 			'object' => $object,
 			'instrument' => self::getService(),
-			'to' => [$profile['url']]];
+			'to' => [$profile['url']],
+		];
 
 		Logger::info('Sending follow ' . $object . ' to ' . $target . ' for user ' . $uid);
 
@@ -2122,12 +2117,13 @@ class Transmitter
 	 * Transmit a message that the contact request had been accepted
 	 *
 	 * @param string  $target Target profile
-	 * @param         $id
+	 * @param string  $id Object id
 	 * @param integer $uid    User ID
+	 * @return void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function sendContactAccept($target, $id, $uid)
+	public static function sendContactAccept(string $target, string $id, int $uid)
 	{
 		$profile = APContact::getByURL($target);
 		if (empty($profile['inbox'])) {
@@ -2136,18 +2132,20 @@ class Transmitter
 		}
 
 		$owner = User::getOwnerDataById($uid);
-		$data = ['@context' => ActivityPub::CONTEXT,
+		$data = [
+			'@context' => ActivityPub::CONTEXT,
 			'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
 			'type' => 'Accept',
 			'actor' => $owner['url'],
 			'object' => [
-				'id' => (string)$id,
+				'id' => $id,
 				'type' => 'Follow',
 				'actor' => $profile['url'],
 				'object' => $owner['url']
 			],
 			'instrument' => self::getService(),
-			'to' => [$profile['url']]];
+			'to' => [$profile['url']],
+		];
 
 		Logger::debug('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id);
 
@@ -2158,14 +2156,14 @@ class Transmitter
 	/**
 	 * Reject a contact request or terminates the contact relation
 	 *
-	 * @param string  $target Target profile
-	 * @param         $id
-	 * @param integer $uid    User ID
+	 * @param string $target   Target profile
+	 * @param string $objectId Object id
+	 * @param int    $uid      User ID
 	 * @return bool Operation success
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function sendContactReject($target, $id, $uid): bool
+	public static function sendContactReject(string $target, string $objectId, int $uid): bool
 	{
 		$profile = APContact::getByURL($target);
 		if (empty($profile['inbox'])) {
@@ -2174,20 +2172,22 @@ class Transmitter
 		}
 
 		$owner = User::getOwnerDataById($uid);
-		$data = ['@context' => ActivityPub::CONTEXT,
+		$data = [
+			'@context' => ActivityPub::CONTEXT,
 			'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
 			'type' => 'Reject',
-			'actor' => $owner['url'],
+			'actor'  => $owner['url'],
 			'object' => [
-				'id' => (string)$id,
+				'id' => $objectId,
 				'type' => 'Follow',
 				'actor' => $profile['url'],
 				'object' => $owner['url']
 			],
 			'instrument' => self::getService(),
-			'to' => [$profile['url']]];
+			'to' => [$profile['url']],
+		];
 
-		Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id);
+		Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
 
 		$signed = LDSignature::sign($data, $owner);
 		return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
@@ -2197,13 +2197,14 @@ class Transmitter
 	 * Transmits a message that we don't want to follow this contact anymore
 	 *
 	 * @param string  $target Target profile
+	 * @param integer $cid    Contact id
 	 * @param integer $uid    User ID
+	 * @return bool success
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 * @throws \Exception
-	 * @return bool success
 	 */
-	public static function sendContactUndo($target, $cid, $uid)
+	public static function sendContactUndo(string $target, int $cid, int $uid): bool
 	{
 		$profile = APContact::getByURL($target);
 		if (empty($profile['inbox'])) {
@@ -2216,26 +2217,39 @@ class Transmitter
 			return false;
 		}
 
-		$id = DI::baseUrl() . '/activity/' . System::createGUID();
+		$objectId = DI::baseUrl() . '/activity/' . System::createGUID();
 
 		$owner = User::getOwnerDataById($uid);
-		$data = ['@context' => ActivityPub::CONTEXT,
-			'id' => $id,
+		$data = [
+			'@context' => ActivityPub::CONTEXT,
+			'id' => $objectId,
 			'type' => 'Undo',
 			'actor' => $owner['url'],
-			'object' => ['id' => $object_id, 'type' => 'Follow',
+			'object' => [
+				'id' => $object_id,
+				'type' => 'Follow',
 				'actor' => $owner['url'],
-				'object' => $profile['url']],
+				'object' => $profile['url']
+			],
 			'instrument' => self::getService(),
-			'to' => [$profile['url']]];
+			'to' => [$profile['url']],
+		];
 
-		Logger::info('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id);
+		Logger::info('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
 
 		$signed = LDSignature::sign($data, $owner);
 		return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
 	}
 
-	private static function prependMentions($body, int $uriid, string $authorLink)
+	/**
+	 * Prepends mentions (@) to $body variable
+	 *
+	 * @param string $body HTML code
+	 * @param int    $uriId
+	 * @param string $authorLink Author link
+	 * @return string HTML code with prepended mentions
+	 */
+	private static function prependMentions(string $body, int $uriid, string $authorLink): string
 	{
 		$mentions = [];