X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FReceiver.php;h=a8b5a18db10136a78c01ad15961b479ae3b5f508;hb=9b8b2b36cdf39852068b3dd372409501f8e31344;hp=99142b50ec192adf0ca1c7d81489fb4e74f1357b;hpb=dc3bbb749ba3e905212345443002672be09922ea;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 99142b50ec..a8b5a18db1 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -222,8 +222,7 @@ class Receiver
 
 			// We had been able to retrieve the object data - so we can trust the source
 			$trust_source = true;
-		} elseif (in_array($type, ['as:Like', 'as:Dislike']) ||
-			(($type == 'as:Follow') && in_array($object_type, self::CONTENT_TYPES))) {
+		} elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
 			// Create a mostly empty array out of the activity data (instead of the object).
 			// This way we later don't have to check for the existence of ech individual array element.
 			$object_data = self::processObject($activity);
@@ -557,7 +556,7 @@ class Receiver
 				// Check if the potential receiver is following the actor
 				// Exception: The receiver is targetted via "to" or this is a comment
 				if ((($element != 'as:to') && empty($replyto)) || ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
-					$networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+					$networks = Protocol::FEDERATED;
 					$condition = ['nurl' => Strings::normaliseLink($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
 						'network' => $networks, 'archive' => false, 'pending' => false, 'uid' => $contact['uid']];
 
@@ -592,7 +591,7 @@ class Receiver
 	public static function getReceiverForActor($actor, $tags)
 	{
 		$receivers = [];
-		$networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+		$networks = Protocol::FEDERATED;
 		$condition = ['nurl' => Strings::normaliseLink($actor), 'rel' => [Contact::SHARING, Contact::FRIEND, Contact::FOLLOWER],
 			'network' => $networks, 'archive' => false, 'pending' => false];
 		$contacts = DBA::select('contact', ['uid', 'rel'], $condition);
@@ -741,11 +740,11 @@ class Receiver
 	 * @param boolean $trust_source Do we trust the provided object?
 	 * @param integer $uid          User ID for the signature that we use to fetch data
 	 *
-	 * @return array with trusted and valid object data
+	 * @return array|false with trusted and valid object data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	private static function fetchObject($object_id, $object = [], $trust_source = false, $uid = 0)
+	private static function fetchObject(string $object_id, array $object = [], bool $trust_source = false, int $uid = 0)
 	{
 		// By fetching the type we check if the object is complete.
 		$type = JsonLD::fetchElement($object, '@type');
@@ -791,6 +790,7 @@ class Receiver
 		}
 
 		Logger::log('Unhandled object type: ' . $type, Logger::DEBUG);
+		return false;
 	}
 
 	/**