Use webfinger in apcontact fetch

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 7e2c591b3de2d960971f889ce546de79d4ef4b62..5306c27d3c6fb65b7c6737edbf0590e540046e47 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Protocol/ActivityPub.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Protocol;
 
 use Friendica\Util\JsonLD;
@@ -153,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) {
@@ -174,7 +193,7 @@ class ActivityPub
         */
        public static function fetchOutbox($url, $uid)
        {
-               $data = self::fetchContent($url);
+               $data = self::fetchContent($url, $uid);
                if (empty($data)) {
                        return;
                }
@@ -196,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
         *