<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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;
'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',
- 'discoverable' => 'toot:discoverable']];
+ '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') ||
+ $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;
}
/**
* @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function fetchContent(string $url, int $uid = 0)
+ public static function fetchContent(string $url, int $uid = 0): array
{
return HTTPSignature::fetch($url, $uid);
}
- private static function getAccountType($apcontact)
+ private static function getAccountType(array $apcontact): int
{
$accounttype = -1;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function probeProfile($url, $update = true)
+ public static function probeProfile(string $url, bool $update = true): array
{
$apcontact = APContact::getByURL($url, $update);
if (empty($apcontact)) {
// $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'];
* @param integer $uid User ID
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function fetchOutbox($url, $uid)
+ public static function fetchOutbox(string $url, int $uid)
{
$data = self::fetchContent($url, $uid);
if (empty($data)) {
* @param integer $uid Optional user id
* @return array Endpoint items
*/
- public static function fetchItems(string $url, int $uid = 0)
+ public static function fetchItems(string $url, int $uid = 0): array
{
$data = self::fetchContent($url, $uid);
if (empty($data)) {
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function isSupportedByContactUrl($url, $update = null)
+ public static function isSupportedByContactUrl(string $url, $update = null)
{
return !empty(APContact::getByURL($url, $update));
}