Remove unused uid parameter in Item::newURI

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index b9ab3931bd3de72ac965de2bf2d1dfd039b7607f..858f837e8f66db36ef266b1003d2ff830be8988c 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -25,6 +25,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
+use Friendica\Protocol\ActivityPub\FetchQueue;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\JsonLD;
 
@@ -83,7 +84,7 @@ class ActivityPub
         *
         * @return bool is it AP?
         */
-       public static function isRequest()
+       public static function isRequest(): bool
        {
                $isrequest = stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
                        stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/json') ||
@@ -202,6 +203,7 @@ class ActivityPub
         *
         * @param string  $url
         * @param integer $uid User ID
+        * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function fetchOutbox(string $url, int $uid)
@@ -222,10 +224,14 @@ class ActivityPub
                        $items = [];
                }
 
+               $fetchQueue = new FetchQueue();
+
                foreach ($items as $activity) {
                        $ldactivity = JsonLD::compact($activity);
-                       ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
+                       ActivityPub\Receiver::processActivity($fetchQueue, $ldactivity, '', $uid, true);
                }
+
+               $fetchQueue->process();
        }
 
        /**
@@ -268,7 +274,7 @@ class ActivityPub
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function isSupportedByContactUrl(string $url, $update = null)
+       public static function isSupportedByContactUrl(string $url, $update = null): bool
        {
                return !empty(APContact::getByURL($url, $update));
        }