Merge pull request #7323 from annando/contact-discovery

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index e6701074c65e2a8f4ed94ba20a9b93a83a344ae2..8caf7ac64c97bb8bd88510d8a93f414a03459030 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -4,9 +4,11 @@
  */
 namespace Friendica\Protocol;
 
+use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
 use Friendica\Core\Protocol;
 use Friendica\Model\APContact;
+use Friendica\Util\HTTPSignature;
 
 /**
  * @brief ActivityPub Protocol class
@@ -40,14 +42,17 @@ class ActivityPub
        const PUBLIC_COLLECTION = 'https://www.w3.org/ns/activitystreams#Public';
        const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
                ['vcard' => 'http://www.w3.org/2006/vcard/ns#',
+               'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/',
                'diaspora' => 'https://diasporafoundation.org/ns/',
+               'litepub' => 'http://litepub.social/ns#',
                'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
-               'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
+               'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
+               'directMessage' => 'litepub:directMessage']];
        const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
        /**
         * Checks if the web request is done for the AP protocol
         *
-        * @return is it AP?
+        * @return bool is it AP?
         */
        public static function isRequest()
        {
@@ -58,12 +63,18 @@ class ActivityPub
        /**
         * Fetches ActivityPub content from the given url
         *
-        * @param string $url content 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($url)
+       public static function fetchContent($url, $uid = 0)
        {
-               $curlResult = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
+               if (!empty($uid)) {
+                       return HTTPSignature::fetch($url, $uid);
+               }
+
+               $curlResult = Network::curl($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return false;
                }
@@ -80,12 +91,15 @@ class ActivityPub
        /**
         * Fetches a profile from the given url into an array that is compatible to Probe::uri
         *
-        * @param string $url profile url
+        * @param string  $url    profile url
+        * @param boolean $update Update the profile
         * @return array
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function probeProfile($url)
+       public static function probeProfile($url, $update = true)
        {
-               $apcontact = APContact::getByURL($url, true);
+               $apcontact = APContact::getByURL($url, $update);
                if (empty($apcontact)) {
                        return false;
                }
@@ -121,8 +135,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)
        {