Merge pull request #11519 from MrPetovan/task/11511-console-domain-move

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

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 359d361b0186f58050b63b2488f42d6f5cd91bc5..78496e2433de2e87fb8db7378f8251db9d536cf5 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-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,9 +21,8 @@
 
 namespace Friendica\Protocol;
 
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
 use Friendica\Util\HTTPSignature;
@@ -65,10 +64,20 @@ 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#',
+               'featured' => [
+                       "@id" => "toot:featured",
+                       "@type" => "@id",
+               ],
+               'schema' => 'http://schema.org#',
                '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',
+               'PropertyValue' => 'schema:PropertyValue',
+               'value' => 'schema:value',
+       ]];
+       const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application', 'Tombstone'];
        /**
         * Checks if the web request is done for the AP protocol
         *
@@ -76,8 +85,15 @@ class ActivityPub
         */
        public static function isRequest()
        {
-               return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
+               $isrequest = stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
+                       stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/json') ||
                        stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
+
+               if ($isrequest) {
+                       Logger::debug('Is AP request', ['accept' => $_SERVER['HTTP_ACCEPT'], 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+               }
+
+               return $isrequest;
        }
 
        /**
@@ -113,6 +129,9 @@ class ActivityPub
                        case 'Application':
                                $accounttype = User::ACCOUNT_TYPE_RELAY;
                                break;
+                       case 'Tombstone':
+                               $accounttype = User::ACCOUNT_TYPE_DELETED;
+                               break;
                }
 
                return $accounttype;
@@ -147,19 +166,27 @@ 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']
                // $profile['location']
                $profile['about'] = $apcontact['about'];
+               $profile['xmpp'] = $apcontact['xmpp'];
+               $profile['matrix'] = $apcontact['matrix'];
                $profile['batch'] = $apcontact['sharedinbox'];
                $profile['notify'] = $apcontact['inbox'];
                $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)) {