return [];
}
+ if (!Network::isValidHttpUrl($url) && !filter_var($url, FILTER_VALIDATE_EMAIL)) {
+ Logger::info('Invalid URL', ['url' => $url]);
+ return [];
+ }
+
$fetched_contact = [];
if (empty($update)) {
$apcontact = [];
- $webfinger = empty(parse_url($url, PHP_URL_SCHEME));
+ // Mastodon profile short-form URL https://domain.tld/@user doesn't return AP data when queried
+ // with HTTPSignature::fetchRaw, but returns the correct data when provided to WebFinger
+ // @see https://github.com/friendica/friendica/issues/13359
+ $webfinger = empty(parse_url($url, PHP_URL_SCHEME)) || strpos($url, '@') !== false;
if ($webfinger) {
$apcontact = self::fetchWebfingerData($url);
if (empty($apcontact['url'])) {
$cachekey = 'apcontact:' . ItemURI::getIdByURI($url);
$result = DI::cache()->get($cachekey);
if (!is_null($result)) {
- Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'callstack' => System::callstack(20), 'result' => $result]);
+ Logger::info('Multiple requests for the address', ['url' => $url, 'update' => $update, 'result' => $result]);
if (!empty($fetched_contact)) {
return $fetched_contact;
}
$curlResult = HTTPSignature::fetchRaw($url);
$failed = empty($curlResult) || empty($curlResult->getBody()) ||
(!$curlResult->isSuccess() && ($curlResult->getReturnCode() != 410));
-
+
if (!$failed) {
$data = json_decode($curlResult->getBody(), true);
$failed = empty($data) || !is_array($data);
*/
public static function isRelay(array $apcontact): bool
{
+ if (in_array($apcontact['type'], ['Person', 'Organization'])) {
+ return false;
+ }
+
+ if (($apcontact['type'] == 'Service') && empty($apcontact['outbox']) && empty($apcontact['sharedinbox']) && empty($apcontact['following']) && empty($apcontact['followers']) && empty($apcontact['statuses_count'])) {
+ return true;
+ }
+
if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
return false;
}