Simplify Contact::addRelationship call in ActivityPub\Processor::followUser

[friendica.git] / src / Protocol / ActivityPub.php

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index f1cd652f47d74885fcec77d72e55226524b20bc3..19eb8c8bce1159e1622ae8ac9145527c42c6a257 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -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
@@ -87,24 +88,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)
@@ -145,7 +131,7 @@ class ActivityPub
        {
                $apcontact = APContact::getByURL($url, $update);
                if (empty($apcontact)) {
-                       return false;
+                       return [];
                }
 
                $profile = ['network' => Protocol::ACTIVITYPUB];
@@ -170,7 +156,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 +180,7 @@ class ActivityPub
         */
        public static function fetchOutbox($url, $uid)
        {
-               $data = self::fetchContent($url);
+               $data = self::fetchContent($url, $uid);
                if (empty($data)) {
                        return;
                }
@@ -213,6 +202,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
         *