AP: Support "discoverable"

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 6b29eabce513f0f0f5092e5c7f6a7a1bdf8b71bb..134f69f4a66fd9a6d45c39cfdb063e734840471f 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica\Protocol;
 
 use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
@@ -64,10 +65,12 @@ class ActivityPub
                'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/',
                'diaspora' => 'https://diasporafoundation.org/ns/',
                'litepub' => 'http://litepub.social/ns#',
+               'toot' => 'http://joinmastodon.org/ns#',
                'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
                'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
-               'directMessage' => 'litepub:directMessage']];
-       const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
+               'directMessage' => 'litepub:directMessage',
+               'discoverable' => 'toot:discoverable']];
+       const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application', 'Tombstone'];
        /**
         * Checks if the web request is done for the AP protocol
         *
@@ -76,6 +79,7 @@ class ActivityPub
        public static function isRequest()
        {
                return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
+                       stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/json') ||
                        stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
        }
 
@@ -87,24 +91,9 @@ class ActivityPub
         * @return array
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function fetchContent($url, $uid = 0)
+       public static function fetchContent(string $url, int $uid = 0)
        {
-               if (!empty($uid)) {
-                       return HTTPSignature::fetch($url, $uid);
-               }
-
-               $curlResult = DI::httpRequest()->get($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
-               if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
-                       return false;
-               }
-
-               $content = json_decode($curlResult->getBody(), true);
-
-               if (empty($content) || !is_array($content)) {
-                       return false;
-               }
-
-               return $content;
+               return HTTPSignature::fetch($url, $uid);
        }
 
        private static function getAccountType($apcontact)
@@ -127,6 +116,9 @@ class ActivityPub
                        case 'Application':
                                $accounttype = User::ACCOUNT_TYPE_RELAY;
                                break;
+                       case 'Tombstone':
+                               $accounttype = User::ACCOUNT_TYPE_DELETED;
+                               break;
                }
 
                return $accounttype;
@@ -161,6 +153,7 @@ class ActivityPub
                $profile['outbox'] = $apcontact['outbox'];
                $profile['sharedinbox'] = $apcontact['sharedinbox'];
                $profile['photo'] = $apcontact['photo'];
+               $profile['header'] = $apcontact['header'];
                $profile['account-type'] = self::getAccountType($apcontact);
                $profile['community'] = ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
                // $profile['keywords']
@@ -171,9 +164,14 @@ class ActivityPub
                $profile['poll'] = $apcontact['outbox'];
                $profile['pubkey'] = $apcontact['pubkey'];
                $profile['subscribe'] = $apcontact['subscribe'];
+               $profile['manually-approve'] = $apcontact['manually-approve'];
                $profile['baseurl'] = $apcontact['baseurl'];
                $profile['gsid'] = $apcontact['gsid'];
 
+               if (!is_null($apcontact['discoverable'])) {
+                       $profile['hide'] = !$apcontact['discoverable'];
+               }
+
                // Remove all "null" fields
                foreach ($profile as $field => $content) {
                        if (is_null($content)) {