use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
-use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\HTTPException;
use Friendica\Util\HTTPSignature;
use Friendica\Util\JsonLD;
use Friendica\Util\Network;
+use GuzzleHttp\Psr7\Uri;
class APContact
{
* @param string $addr Address
* @return array webfinger data
*/
- private static function fetchWebfingerData(string $addr)
+ private static function fetchWebfingerData(string $addr): array
{
$addr_parts = explode('@', $addr);
if (count($addr_parts) != 2) {
* @return array profile array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
+ * @todo Rewrite parameter $update to avoid true|false|null (boolean is binary, null adds a third case)
*/
- public static function getByURL($url, $update = null)
+ public static function getByURL(string $url, $update = null): array
{
if (empty($url) || Network::isUrlBlocked($url)) {
Logger::info('Domain is blocked', ['url' => $url]);
return [];
}
- $fetched_contact = false;
+ $fetched_contact = [];
if (empty($update)) {
if (is_null($update)) {
return $fetched_contact;
}
$url = $apcontact['url'];
+ } elseif (empty(parse_url($url, PHP_URL_PATH))) {
+ $apcontact['baseurl'] = $url;
}
// Detect multiple fast repeating request to the same address
$apcontact['type'] = str_replace('as:', '', JsonLD::fetchElement($compacted, '@type'));
$apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id');
$apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id');
- $apcontact['inbox'] = JsonLD::fetchElement($compacted, 'ldp:inbox', '@id');
+ $apcontact['inbox'] = (JsonLD::fetchElement($compacted, 'ldp:inbox', '@id') ?? '');
self::unarchiveInbox($apcontact['inbox'], false);
$apcontact['outbox'] = JsonLD::fetchElement($compacted, 'as:outbox', '@id');
$apcontact['sharedinbox'] = '';
if (!empty($compacted['as:endpoints'])) {
- $apcontact['sharedinbox'] = JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id');
+ $apcontact['sharedinbox'] = (JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id') ?? '');
self::unarchiveInbox($apcontact['sharedinbox'], true);
}
$apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
+ $apcontact['suspended'] = (int)JsonLD::fetchElement($compacted, 'toot:suspended');
+
if (!empty($compacted['as:generator'])) {
$apcontact['baseurl'] = JsonLD::fetchElement($compacted['as:generator'], 'as:url', '@id');
$apcontact['generator'] = JsonLD::fetchElement($compacted['as:generator'], 'as:name', '@value');
if (strlen($apcontact['photo']) > 255) {
$parts = parse_url($apcontact['photo']);
unset($parts['fragment']);
- $apcontact['photo'] = Network::unparseURL($parts);
+ $apcontact['photo'] = (string)Uri::fromParts($parts);
if (strlen($apcontact['photo']) > 255) {
unset($parts['query']);
- $apcontact['photo'] = Network::unparseURL($parts);
+ $apcontact['photo'] = (string)Uri::fromParts($parts);
}
if (strlen($apcontact['photo']) > 255) {
}
// Limit the length on incoming fields
- $apcontact = DBStructure::getFieldsForTable('apcontact', $apcontact);
+ $apcontact = DI::dbaDefinition()->truncateFieldsForTable('apcontact', $apcontact);
if (DBA::exists('apcontact', ['url' => $apcontact['url']])) {
DBA::update('apcontact', $apcontact, ['url' => $apcontact['url']]);
*
* @param string $url inbox url
* @param boolean $shared Shared Inbox
+ * @return void
*/
- private static function unarchiveInbox($url, $shared)
+ private static function unarchiveInbox(string $url, bool $shared)
{
if (empty($url)) {
return;
HTTPSignature::setInboxStatus($url, true, $shared);
}
+
+ /**
+ * Check if the apcontact is a relay account
+ *
+ * @param array $apcontact
+ *
+ * @return bool
+ */
+ public static function isRelay(array $apcontact): bool
+ {
+ if ($apcontact['nick'] != 'relay') {
+ return false;
+ }
+
+ if ($apcontact['type'] == 'Application') {
+ return true;
+ }
+
+ if (in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) {
+ return true;
+ }
+
+ return false;
+ }
}