X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub.php;h=beb5be125d3df9bf98e332e19216b8f4fb2fae1b;hb=8f27e3aeb11809db601bea1d3690343377c940ca;hp=e7614afa99fa1f06ee3fa994dcb78dbbca6a6840;hpb=58c6ef2bc0fdf7ca7210e98fd21a1b08c08ed409;p=friendica.git

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index e7614afa99..beb5be125d 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -7,6 +7,7 @@ namespace Friendica\Protocol;
 use Friendica\Util\Network;
 use Friendica\Core\Protocol;
 use Friendica\Model\APContact;
+use Friendica\Util\HTTPSignature;
 
 /**
  * @brief ActivityPub Protocol class
@@ -29,18 +30,22 @@ use Friendica\Model\APContact;
  *
  * To-do:
  * - Polling the outboxes for missing content?
+ *
+ * Missing parts from DFRN:
+ * - Public Forum
+ * - Private Forum
+ * - Relocation
  */
 class ActivityPub
 {
 	const PUBLIC_COLLECTION = 'https://www.w3.org/ns/activitystreams#Public';
 	const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
 		['vcard' => 'http://www.w3.org/2006/vcard/ns#',
+		'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/',
 		'diaspora' => 'https://diasporafoundation.org/ns/',
 		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
 		'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
 	const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
-	const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image'];
-	const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'];
 	/**
 	 * Checks if the web request is done for the AP protocol
 	 *
@@ -55,17 +60,28 @@ class ActivityPub
 	/**
 	 * Fetches ActivityPub content from the given url
 	 *
-	 * @param string $url content url
+	 * @param string  $url content url
+	 * @param integer $uid User ID for the signature
 	 * @return array
 	 */
-	public static function fetchContent($url)
+	public static function fetchContent($url, $uid = 0)
 	{
-		$ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
-		if (!$ret['success'] || empty($ret['body'])) {
+		if (!empty($uid)) {
+			return HTTPSignature::fetch($url, 1);
+		}
+
+		$curlResult = Network::curl($url, false, $redirects, ['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 json_decode($ret['body'], true);
+		return $content;
 	}
 
 	/**
@@ -134,7 +150,8 @@ class ActivityPub
 		}
 
 		foreach ($items as $activity) {
-			ActivityPub\Receiver::processActivity($activity, '', $uid, true);
+			$ldactivity = JsonLD::compact($activity);
+			ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
 		}
 	}
 }