X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FReceiver.php;h=6910ee11c227d175ad3eae2324a0ac097805f22e;hb=cc5e5be931bc21e44d0cb26778e8cc15be924e41;hp=8a3f76c5ea1789d0401e7ff6c1612468a1460a23;hpb=bc5a1e5acee9ceb61cd08734c554f69850120d76;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 8a3f76c5ea..6910ee11c2 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -61,8 +61,11 @@ class Receiver
 	const TARGET_UNKNOWN = 0;
 	const TARGET_TO = 1;
 	const TARGET_CC = 2;
-	const TARGET_BCC = 3;
-	const TARGET_FOLLOWER = 4;
+	const TARGET_BTO = 3;
+	const TARGET_BCC = 4;
+	const TARGET_FOLLOWER = 5;
+	const TARGET_ANSWER = 6;
+	const TARGET_GLOBAL = 7;
 
 	/**
 	 * Checks if the web request is done for the AP protocol
@@ -85,17 +88,7 @@ class Receiver
 	 */
 	public static function processInbox($body, $header, $uid)
 	{
-		$http_signer = HTTPSignature::getSigner($body, $header);
-		if (empty($http_signer)) {
-			Logger::warning('Invalid HTTP signature, message will be discarded.');
-			return;
-		} else {
-			Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
-		}
-
-		$signer = [$http_signer];
 		$activity = json_decode($body, true);
-
 		if (empty($activity)) {
 			Logger::warning('Invalid body.');
 			return;
@@ -105,6 +98,22 @@ class Receiver
 
 		$actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id');
 
+		$apcontact = APContact::getByURL($actor);
+		if (!empty($apcontact) && ($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay')) {
+			self::processRelayPost($ldactivity);
+			return;
+		}
+
+		$http_signer = HTTPSignature::getSigner($body, $header);
+		if (empty($http_signer)) {
+			Logger::warning('Invalid HTTP signature, message will be discarded.');
+			return;
+		} else {
+			Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
+		}
+
+		$signer = [$http_signer];
+
 		Logger::info('Message for user ' . $uid . ' is from actor ' . $actor);
 
 		if (LDSignature::isSigned($activity)) {
@@ -138,6 +147,49 @@ class Receiver
 		self::processActivity($ldactivity, $body, $uid, $trust_source, true, $signer);
 	}
 
+	/**
+	 * Process incoming posts from relays
+	 *
+	 * @param array $activity
+	 * @return void
+	 */
+	private static function processRelayPost(array $activity)
+	{
+		$type = JsonLD::fetchElement($activity, '@type');
+		if (!$type) {
+			Logger::info('Empty type', ['activity' => $activity]);
+			return;
+		}
+
+		if ($type != 'as:Announce') {
+			Logger::info('Not an announcement', ['activity' => $activity]);
+			return;
+		}
+
+		$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
+		if (empty($object_id)) {
+			Logger::info('No object id found', ['activity' => $activity]);
+			return;
+		}
+
+		Logger::info('Got relayed message id', ['id' => $object_id]);
+
+		$item_id = Item::searchByLink($object_id);
+		if ($item_id) {
+			Logger::info('Relayed message already exists', ['id' => $object_id, 'item' => $item_id]);
+			return;
+		}
+
+		Processor::fetchMissingActivity($object_id);
+
+		$item_id = Item::searchByLink($object_id);
+		if ($item_id) {
+			Logger::info('Relayed message had been fetched and stored', ['id' => $object_id, 'item' => $item_id]);
+		} else {
+			Logger::notice('Relayed message had not been stored', ['id' => $object_id]);
+		}
+	}
+
 	/**
 	 * Fetches the object type for a given object id
 	 *
@@ -221,14 +273,20 @@ class Receiver
 		$type = JsonLD::fetchElement($activity, '@type');
 
 		// Fetch all receivers from to, cc, bto and bcc
-		$receivers = self::getReceivers($activity, $actor);
-		$reception_type = [];
+		$receiverdata = self::getReceivers($activity, $actor);
+		$receivers = $reception_types = [];
+		foreach ($receiverdata as $key => $data) {
+			$receivers[$key] = $data['uid'];
+			$reception_types[$data['uid']] = $data['type'] ?? 0;
+		}
 
 		// When it is a delivery to a personal inbox we add that user to the receivers
 		if (!empty($uid)) {
-			$reception_type[$uid] = self::TARGET_BCC;
 			$additional = ['uid:' . $uid => $uid];
 			$receivers = array_merge($receivers, $additional);
+			if (empty($reception_types[$uid]) || in_array($reception_types[$uid], [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER, self::TARGET_GLOBAL])) {
+				$reception_types[$uid] = self::TARGET_BCC;
+			}
 		} else {
 			// We possibly need some user to fetch private content,
 			// so we fetch the first out ot the list.
@@ -310,7 +368,7 @@ class Receiver
 		$object_data['actor'] = $actor;
 		$object_data['item_receiver'] = $receivers;
 		$object_data['receiver'] = array_merge($object_data['receiver'] ?? [], $receivers);
-		$object_data['reception_type'] = $reception_type;
+		$object_data['reception_type'] = array_merge($object_data['reception_type'] ?? [], $reception_types);
 
 		$author = $object_data['author'] ?? $actor;
 		if (!empty($author) && !empty($object_data['id'])) {
@@ -429,6 +487,11 @@ class Receiver
 					$object_data['thread-completion'] = true;
 
 					$item = ActivityPub\Processor::createItem($object_data);
+					if (empty($item)) {
+						return;
+					}
+
+					$item['post-type'] = Item::PT_ANNOUNCEMENT;
 					ActivityPub\Processor::postItem($object_data, $item);
 
 					$announce_object_data = self::processObject($activity);
@@ -537,18 +600,30 @@ class Receiver
 	 */
 	private static function getReceivers($activity, $actor, $tags = [], $fetch_unlisted = false)
 	{
-		$receivers = [];
+		$reply = $receivers = [];
 
 		// When it is an answer, we inherite the receivers from the parent
 		$replyto = JsonLD::fetchElement($activity, 'as:inReplyTo', '@id');
 		if (!empty($replyto)) {
+			$reply = [$replyto];
+
 			// Fix possibly wrong item URI (could be an answer to a plink uri)
 			$fixedReplyTo = Item::getURIByLink($replyto);
-			$replyto = $fixedReplyTo ?: $replyto;
+			if (!empty($fixedReplyTo)) {
+				$reply[] = $fixedReplyTo;
+			}
+		}
+
+		// Fetch all posts that refer to the object id
+		$object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
+		if (!empty($object_id)) {
+			$reply[] = $object_id;
+		}
 
-			$parents = Item::select(['uid'], ['uri' => $replyto]);
+		if (!empty($reply)) {
+			$parents = Item::select(['uid'], ['uri' => $reply]);
 			while ($parent = Item::fetch($parents)) {
-				$receivers['uid:' . $parent['uid']] = $parent['uid'];
+				$receivers['uid:' . $parent['uid']] = ['uid' => $parent['uid'], 'type' => self::TARGET_ANSWER];
 			}
 		}
 
@@ -570,17 +645,17 @@ class Receiver
 
 			foreach ($receiver_list as $receiver) {
 				if ($receiver == self::PUBLIC_COLLECTION) {
-					$receivers['uid:0'] = 0;
+					$receivers['uid:0'] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
 				}
 
 				// Add receiver "-1" for unlisted posts 
 				if ($fetch_unlisted && ($receiver == self::PUBLIC_COLLECTION) && ($element == 'as:cc')) {
-					$receivers['uid:-1'] = -1;
+					$receivers['uid:-1'] = ['uid' => -1, 'type' => self::TARGET_GLOBAL];
 				}
 
 				// Fetch the receivers for the public and the followers collection
 				if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
-					$receivers = array_merge($receivers, self::getReceiverForActor($actor, $tags));
+					$receivers = self::getReceiverForActor($actor, $tags, $receivers);
 					continue;
 				}
 
@@ -608,7 +683,25 @@ class Receiver
 					}
 				}
 
-				$receivers['uid:' . $contact['uid']] = $contact['uid'];
+				$type = $receivers['uid:' . $contact['uid']]['type'] ?? self::TARGET_UNKNOWN;
+				if (in_array($type, [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER, self::TARGET_GLOBAL])) {
+					switch ($element) {
+						case 'as:to':
+							$type = self::TARGET_TO;
+							break;
+						case 'as:cc':
+							$type = self::TARGET_CC;
+							break;
+						case 'as:bto':
+							$type = self::TARGET_BTO;
+							break;
+						case 'as:bcc':
+							$type = self::TARGET_BCC;
+							break;
+					}
+
+					$receivers['uid:' . $contact['uid']] = ['uid' => $contact['uid'], 'type' => $type];
+				}
 			}
 		}
 
@@ -626,17 +719,16 @@ class Receiver
 	 * @return array with receivers (user id)
 	 * @throws \Exception
 	 */
-	private static function getReceiverForActor($actor, $tags)
+	private static function getReceiverForActor($actor, $tags, $receivers)
 	{
-		$receivers = [];
 		$basecondition = ['rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER],
 			'network' => Protocol::FEDERATED, 'archive' => false, 'pending' => false];
 
 		$condition = DBA::mergeConditions($basecondition, ['nurl' => Strings::normaliseLink($actor)]);
 		$contacts = DBA::select('contact', ['uid', 'rel'], $condition);
 		while ($contact = DBA::fetch($contacts)) {
-			if (self::isValidReceiverForActor($contact, $actor, $tags)) {
-				$receivers['uid:' . $contact['uid']] = $contact['uid'];
+			if (empty($receivers['uid:' . $contact['uid']]) && self::isValidReceiverForActor($contact, $actor, $tags)) {
+				$receivers['uid:' . $contact['uid']] = ['uid' => $contact['uid'], 'type' => self::TARGET_FOLLOWER];
 			}
 		}
 		DBA::close($contacts);
@@ -645,8 +737,8 @@ class Receiver
 		$condition = DBA::mergeConditions($basecondition, ["`alias` IN (?, ?)", Strings::normaliseLink($actor), $actor]);
 		$contacts = DBA::select('contact', ['uid', 'rel'], $condition);
 		while ($contact = DBA::fetch($contacts)) {
-			if (self::isValidReceiverForActor($contact, $actor, $tags)) {
-				$receivers['uid:' . $contact['uid']] = $contact['uid'];
+			if (empty($receivers['uid:' . $contact['uid']]) && self::isValidReceiverForActor($contact, $actor, $tags)) {
+				$receivers['uid:' . $contact['uid']] = ['uid' => $contact['uid'], 'type' => self::TARGET_FOLLOWER];
 			}
 		}
 		DBA::close($contacts);
@@ -737,14 +829,14 @@ class Receiver
 		}
 
 		foreach ($receivers as $receiver) {
-			$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'nurl' => Strings::normaliseLink($actor)]);
+			$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver['uid'], 'network' => Protocol::OSTATUS, 'nurl' => Strings::normaliseLink($actor)]);
 			if (DBA::isResult($contact)) {
-				self::switchContact($contact['id'], $receiver, $actor);
+				self::switchContact($contact['id'], $receiver['uid'], $actor);
 			}
 
-			$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'alias' => [Strings::normaliseLink($actor), $actor]]);
+			$contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver['uid'], 'network' => Protocol::OSTATUS, 'alias' => [Strings::normaliseLink($actor), $actor]]);
 			if (DBA::isResult($contact)) {
-				self::switchContact($contact['id'], $receiver, $actor);
+				self::switchContact($contact['id'], $receiver['uid'], $actor);
 			}
 		}
 	}
@@ -1238,7 +1330,16 @@ class Receiver
 			$object_data = self::processAttachmentUrls($object, $object_data);
 		}
 
-		$object_data['receiver'] = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
+		$receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
+		$receivers = $reception_types = [];
+		foreach ($receiverdata as $key => $data) {
+			$receivers[$key] = $data['uid'];
+			$reception_types[$data['uid']] = $data['type'] ?? 0;
+		}
+
+		$object_data['receiver'] = $receivers;
+		$object_data['reception_type'] = $reception_types;
+
 		$object_data['unlisted'] = in_array(-1, $object_data['receiver']);
 		unset($object_data['receiver']['uid:-1']);