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
{
* @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(string $url, $update = null): array
{
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
if ($failed) {
self::markForArchival($fetched_contact ?: []);
- return $fetched_contact ?? [];
+ return $fetched_contact;
}
}
// Quit if none of the basic values are set
if (empty($apcontact['url']) || empty($apcontact['type']) || (($apcontact['type'] != 'Tombstone') && empty($apcontact['inbox']))) {
- return $fetched_contact ?? [];
+ return $fetched_contact;
} elseif ($apcontact['type'] == 'Tombstone') {
// The "inbox" field must have a content
$apcontact['inbox'] = '';
// Quit if this doesn't seem to be an account at all
if (!in_array($apcontact['type'], ActivityPub::ACCOUNT_TYPES)) {
- return $fetched_contact ?? [];
+ return $fetched_contact;
}
$parts = parse_url($apcontact['url']);
$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(string $url, bool $shared)
{
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;
+ }
}