Use webfinger in apcontact fetch

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index f1cd652f47d74885fcec77d72e55226524b20bc3..5306c27d3c6fb65b7c6737edbf0590e540046e47 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -170,7 +170,9 @@ class ActivityPub
                $profile['notify'] = $apcontact['inbox'];
                $profile['poll'] = $apcontact['outbox'];
                $profile['pubkey'] = $apcontact['pubkey'];
+               $profile['subscribe'] = $apcontact['subscribe'];
                $profile['baseurl'] = $apcontact['baseurl'];
+               $profile['gsid'] = $apcontact['gsid'];
 
                // Remove all "null" fields
                foreach ($profile as $field => $content) {
@@ -191,7 +193,7 @@ class ActivityPub
         */
        public static function fetchOutbox($url, $uid)
        {
-               $data = self::fetchContent($url);
+               $data = self::fetchContent($url, $uid);
                if (empty($data)) {
                        return;
                }
@@ -213,6 +215,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
         *