<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Protocol;
use Friendica\Core\Protocol;
-use Friendica\Database\DBA;
-use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\User;
use Friendica\Util\HTTPSignature;
'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/',
'diaspora' => 'https://diasporafoundation.org/ns/',
'litepub' => 'http://litepub.social/ns#',
+ 'toot' => 'http://joinmastodon.org/ns#',
+ '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
*
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');
}
*/
public static function fetchContent(string $url, int $uid = 0)
{
- if (empty($uid)) {
- $user = User::getFirstAdmin(['uid']);
-
- if (empty($user['uid'])) {
- // When the system setup is missing an admin we just take the first user
- $condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false];
- $user = DBA::selectFirst('user', ['uid'], $condition);
- }
-
- if (!empty($user['uid'])) {
- $uid = $user['uid'];
- }
- }
-
return HTTPSignature::fetch($url, $uid);
}
case 'Application':
$accounttype = User::ACCOUNT_TYPE_RELAY;
break;
+ case 'Tombstone':
+ $accounttype = User::ACCOUNT_TYPE_DELETED;
+ break;
}
return $accounttype;
$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)) {