X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub.php;h=bf8fed94c6078652f0ef9dcede2feabe5c427567;hb=f40c57fc204ff47a3cf9f7eab75e8a635566275c;hp=c84f5d3ee41082e321cc09e8d588bb0944cde88e;hpb=3ab837f3c783e14e2c8836e73c898041c47f2fd0;p=friendica.git

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index c84f5d3ee4..bf8fed94c6 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -4,26 +4,11 @@
  */
 namespace Friendica\Protocol;
 
-use Friendica\Database\DBA;
-use Friendica\Core\System;
-use Friendica\BaseObject;
+use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
-use Friendica\Util\HTTPSignature;
 use Friendica\Core\Protocol;
-use Friendica\Model\Conversation;
-use Friendica\Model\Contact;
 use Friendica\Model\APContact;
-use Friendica\Model\Item;
-use Friendica\Model\Profile;
-use Friendica\Model\Term;
-use Friendica\Model\User;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Crypto;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
-use Friendica\Util\JsonLD;
-use Friendica\Util\LDSignature;
-use Friendica\Core\Config;
+use Friendica\Util\HTTPSignature;
 
 /**
  * @brief ActivityPub Protocol class
@@ -41,50 +26,31 @@ use Friendica\Core\Config;
  * Mastodon implementation of supported activities:
  * https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/activity.rb#L26
  *
- * To-do:
- *
- * Receiver:
- * - Update (Image, Video, Article, Note)
- * - Event
- * - Undo Announce
- *
- * Check what this is meant to do:
- * - Add
- * - Block
- * - Flag
- * - Remove
- * - Undo Block
- * - Undo Accept (Problem: This could invert a contact accept or an event accept)
- *
- * Transmitter:
- * - Event
- *
- * Complicated:
- * - Announce
- * - Undo Announce
+ * Funkwhale:
+ * http://docs-funkwhale-funkwhale-549-music-federation-documentation.preview.funkwhale.audio/federation/index.html
  *
- * General:
- * - Attachments
- * - nsfw (sensitive)
- * - Queueing unsucessful deliveries
+ * To-do:
  * - Polling the outboxes for missing content?
- * - Possibly using the LD-JSON parser
+ *
+ * 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'];
 	/**
-	 * @brief Checks if the web request is done for the AP protocol
+	 * Checks if the web request is done for the AP protocol
 	 *
-	 * @return is it AP?
+	 * @return bool is it AP?
 	 */
 	public static function isRequest()
 	{
@@ -95,17 +61,29 @@ 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
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	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, $uid);
+		}
+
+		$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;
 	}
 
 	/**
@@ -113,6 +91,8 @@ class ActivityPub
 	 *
 	 * @param string $url profile url
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function probeProfile($url)
 	{
@@ -150,10 +130,11 @@ class ActivityPub
 	}
 
 	/**
-	 * @brief 
+	 * Fetches activities from the outbox of a given profile and processes it
 	 *
-	 * @param $url
+	 * @param string  $url
 	 * @param integer $uid User ID
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fetchOutbox($url, $uid)
 	{
@@ -174,7 +155,8 @@ class ActivityPub
 		}
 
 		foreach ($items as $activity) {
-			ActivityPub\Receiver::processActivity($activity, '', $uid, true);
+			$ldactivity = JsonLD::compact($activity);
+			ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
 		}
 	}
 }