Merge pull request #6908 from annando/sig-auth

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index beb5be125d3df9bf98e332e19216b8f4fb2fae1b..bf8fed94c6078652f0ef9dcede2feabe5c427567 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -4,6 +4,7 @@
  */
 namespace Friendica\Protocol;
 
+use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
 use Friendica\Core\Protocol;
 use Friendica\Model\APContact;
@@ -49,7 +50,7 @@ class ActivityPub
        /**
         * Checks if the web request is done for the AP protocol
         *
-        * @return is it AP?
+        * @return bool is it AP?
         */
        public static function isRequest()
        {
@@ -63,11 +64,12 @@ class ActivityPub
         * @param string  $url content url
         * @param integer $uid User ID for the signature
         * @return array
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function fetchContent($url, $uid = 0)
        {
                if (!empty($uid)) {
-                       return HTTPSignature::fetch($url, 1);
+                       return HTTPSignature::fetch($url, $uid);
                }
 
                $curlResult = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
@@ -89,6 +91,8 @@ class ActivityPub
         *
         * @param string $url profile url
         * @return array
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function probeProfile($url)
        {
@@ -128,8 +132,9 @@ class ActivityPub
        /**
         * Fetches activities from the outbox of a given profile and processes it
         *
-        * @param string $url
+        * @param string  $url
         * @param integer $uid User ID
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function fetchOutbox($url, $uid)
        {