Merge pull request #13724 from Raroun/Fix-for-Issue-#13637---Photo-caption-prevents...

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 11359b339a4e22d7b6a0ef303d31285620eaec02..c27506ec1ef310501a6a377fef39d4b248f3d190 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -105,19 +105,6 @@ class ActivityPub
                return $isrequest;
        }
 
-       /**
-        * Fetches ActivityPub content from the given 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(string $url, int $uid = 0): array
-       {
-               return HTTPSignature::fetch($url, $uid);
-       }
-
        private static function getAccountType(array $apcontact): int
        {
                $accounttype = -1;
@@ -216,7 +203,7 @@ class ActivityPub
         */
        public static function fetchOutbox(string $url, int $uid)
        {
-               $data = self::fetchContent($url, $uid);
+               $data = HTTPSignature::fetch($url, $uid);
                if (empty($data)) {
                        return;
                }
@@ -241,21 +228,21 @@ class ActivityPub
        /**
         * Fetch items from AP endpoints
         *
-        * @param string $url        Address of the endpoint
-        * @param integer $uid       Optional user id
-        * @param integer $timestamp Internally used parameter to stop fetching after some time
+        * @param string $url              Address of the endpoint
+        * @param integer $uid             Optional user id
+        * @param integer $start_timestamp Internally used parameter to stop fetching after some time
         * @return array Endpoint items
         */
-       public static function fetchItems(string $url, int $uid = 0, int $timestamp = 0): array
+       public static function fetchItems(string $url, int $uid = 0, int $start_timestamp = 0): array
        {
-               $timestamp = $timestamp ?: time();
+               $start_timestamp = $start_timestamp ?: time();
 
-               if ((time() - $timestamp) > 60) {
+               if ((time() - $start_timestamp) > 60) {
                        Logger::info('Fetch time limit reached', ['url' => $url, 'uid' => $uid]);
                        return [];
                }
 
-               $data = self::fetchContent($url, $uid);
+               $data = HTTPSignature::fetch($url, $uid);
                if (empty($data)) {
                        return [];
                }
@@ -265,13 +252,13 @@ class ActivityPub
                } 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, $timestamp);
+                       return self::fetchItems($data['first'], $uid, $start_timestamp);
                } else {
                        return [];
                }
 
                if (!empty($data['next']) && is_string($data['next'])) {
-                       $items = array_merge($items, self::fetchItems($data['next'], $uid, $timestamp));
+                       $items = array_merge($items, self::fetchItems($data['next'], $uid, $start_timestamp));
                }
 
                return $items;