use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\HTTPException;
use Friendica\Network\Probe;
use Friendica\Protocol\ActivityNamespace;
return [];
}
+ if (!Network::isValidHttpUrl($url) && !filter_var($url, FILTER_VALIDATE_EMAIL)) {
+ Logger::info('Invalid URL', ['url' => $url]);
+ return [];
+ }
+
$fetched_contact = [];
if (empty($update)) {
if (empty($data)) {
$local_owner = [];
- $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);
- }
+ try {
+ $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);
+ }
- if (!$failed && ($curlResult->getReturnCode() == 410)) {
- $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone'];
+ if (!$failed && ($curlResult->getReturnCode() == 410)) {
+ $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone'];
+ }
+ } catch (\Exception $exception) {
+ Logger::notice('Error fetching url', ['url' => $url, 'exception' => $exception]);
+ $failed = true;
}
if ($failed) {
$apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
$apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
+ } elseif (empty($apcontact['photo'])) {
+ $photo = JsonLD::fetchElementArray($compacted, 'as:icon', 'as:url');
+ if (!empty($photo[0]['@id'])) {
+ $apcontact['photo'] = $photo[0]['@id'];
+ }
}
$apcontact['header'] = JsonLD::fetchElement($compacted, 'as:image', '@id');
*/
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;
}