X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub.php;h=c42dad2eb39c26dc6b6990f0e924235d05455b0a;hb=be7a01f086ad2bf3f4ed479f72366c3de64a056e;hp=f1cd652f47d74885fcec77d72e55226524b20bc3;hpb=2ec3a97393959e42d450e074271d2d622d25701f;p=friendica.git

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index f1cd652f47..c42dad2eb3 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,12 +21,13 @@
 
 namespace Friendica\Protocol;
 
-use Friendica\Util\JsonLD;
-use Friendica\Util\Network;
 use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
 use Friendica\Util\HTTPSignature;
+use Friendica\Util\JsonLD;
 
 /**
  * ActivityPub Protocol class
@@ -67,7 +68,7 @@ class ActivityPub
 		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
 		'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
 		'directMessage' => 'litepub:directMessage']];
-	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
+	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application', 'Tombstone'];
 	/**
 	 * Checks if the web request is done for the AP protocol
 	 *
@@ -76,6 +77,7 @@ class ActivityPub
 	public static function isRequest()
 	{
 		return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
+			stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/json') ||
 			stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
 	}
 
@@ -87,24 +89,9 @@ class ActivityPub
 	 * @return array
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function fetchContent($url, $uid = 0)
+	public static function fetchContent(string $url, int $uid = 0)
 	{
-		if (!empty($uid)) {
-			return HTTPSignature::fetch($url, $uid);
-		}
-
-		$curlResult = Network::curl($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
-		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
-			return false;
-		}
-
-		$content = json_decode($curlResult->getBody(), true);
-
-		if (empty($content) || !is_array($content)) {
-			return false;
-		}
-
-		return $content;
+		return HTTPSignature::fetch($url, $uid);
 	}
 
 	private static function getAccountType($apcontact)
@@ -127,6 +114,9 @@ class ActivityPub
 			case 'Application':
 				$accounttype = User::ACCOUNT_TYPE_RELAY;
 				break;
+			case 'Tombstone':
+				$accounttype = User::ACCOUNT_TYPE_DELETED;
+				break;
 		}
 
 		return $accounttype;
@@ -145,7 +135,7 @@ class ActivityPub
 	{
 		$apcontact = APContact::getByURL($url, $update);
 		if (empty($apcontact)) {
-			return false;
+			return [];
 		}
 
 		$profile = ['network' => Protocol::ACTIVITYPUB];
@@ -170,7 +160,10 @@ class ActivityPub
 		$profile['notify'] = $apcontact['inbox'];
 		$profile['poll'] = $apcontact['outbox'];
 		$profile['pubkey'] = $apcontact['pubkey'];
+		$profile['subscribe'] = $apcontact['subscribe'];
+		$profile['manually-approve'] = $apcontact['manually-approve'];
 		$profile['baseurl'] = $apcontact['baseurl'];
+		$profile['gsid'] = $apcontact['gsid'];
 
 		// Remove all "null" fields
 		foreach ($profile as $field => $content) {
@@ -191,7 +184,7 @@ class ActivityPub
 	 */
 	public static function fetchOutbox($url, $uid)
 	{
-		$data = self::fetchContent($url);
+		$data = self::fetchContent($url, $uid);
 		if (empty($data)) {
 			return;
 		}
@@ -213,6 +206,37 @@ class ActivityPub
 		}
 	}
 
+	/**
+	 * Fetch items from AP endpoints
+	 *
+	 * @param string $url  Address of the endpoint
+	 * @param integer $uid Optional user id
+	 * @return array Endpoint items
+	 */
+	public static function fetchItems(string $url, int $uid = 0)
+	{
+		$data = self::fetchContent($url, $uid);
+		if (empty($data)) {
+			return [];
+		}
+
+		if (!empty($data['orderedItems'])) {
+			$items = $data['orderedItems'];
+		} elseif (!empty($data['first']['orderedItems'])) {
+			$items = $data['first']['orderedItems'];
+		} elseif (!empty($data['first']) && is_string($data['first']) && ($data['first'] != $url)) {
+			return self::fetchItems($data['first'], $uid);
+		} else {
+			return [];
+		}
+
+		if (!empty($data['next']) && is_string($data['next'])) {
+			$items = array_merge($items, self::fetchItems($data['next'], $uid));
+		}
+
+		return $items;
+	}
+
 	/**
 	 * Checks if the given contact url does support ActivityPub
 	 *