spelling: chosen

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 072dea9d3e753dbfbe9b8f13779f87f409697749..dc062fe5b506afd222a92f7b4f8c75f70d413a0b 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -29,7 +29,6 @@ use Friendica\Core\System;
 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;
@@ -71,21 +70,14 @@ class APContact
                        return $data;
                }
 
-               $data = ['addr' => $addr];
-               $template = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
-               $webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), HttpClientAccept::JRD_JSON);
-               if (empty($webfinger['links'])) {
-                       $template = 'http://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
-                       $webfinger = Probe::webfinger(str_replace('{uri}', urlencode($addr), $template), HttpClientAccept::JRD_JSON);
-                       if (empty($webfinger['links'])) {
-                               return [];
-                       }
-                       $data['baseurl'] = 'http://' . $addr_parts[1];
-               } else {
-                       $data['baseurl'] = 'https://' . $addr_parts[1];
+               $webfinger = Probe::getWebfingerArray($addr);
+               if (empty($webfinger['webfinger']['links'])) {
+                       return [];
                }
 
-               foreach ($webfinger['links'] as $link) {
+               $data['baseurl'] = $webfinger['baseurl'];
+
+               foreach ($webfinger['webfinger']['links'] as $link) {
                        if (empty($link['rel'])) {
                                continue;
                        }
@@ -176,7 +168,7 @@ class APContact
                $cachekey = 'apcontact:' . ItemURI::getIdByURI($url);
                $result = DI::cache()->get($cachekey);
                if (!is_null($result)) {
-                       Logger::notice('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, 'callstack' => System::callstack(20), 'result' => $result]);
                        if (!empty($fetched_contact)) {
                                return $fetched_contact;
                        }
@@ -196,17 +188,22 @@ class APContact
                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) {
@@ -261,6 +258,11 @@ class APContact
                $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');
@@ -365,20 +367,13 @@ class APContact
 
                $apcontact['discoverable'] = JsonLD::fetchElement($compacted, 'toot:discoverable', '@value');
 
-               // To-Do
-
-               // Unhandled
-               // tag, attachment, image, nomadicLocations, signature, movedTo, liked
+               if (!empty($apcontact['photo'])) {
+                       $apcontact['photo'] = Network::addBasePath($apcontact['photo'], $apcontact['url']);
 
-               // Unhandled from Misskey
-               // sharedInbox, isCat
-
-               // Unhandled from Kroeg
-               // kroeg:blocks, updated
-
-               if (!empty($apcontact['photo']) && !Network::isValidHttpUrl($apcontact['photo'])) {
-                       Logger::info('Invalid URL for photo', ['url' => $apcontact['url'], 'photo' => $apcontact['photo']]);
-                       $apcontact['photo'] = null;
+                       if (!Network::isValidHttpUrl($apcontact['photo'])) {
+                               Logger::warning('Invalid URL for photo', ['url' => $apcontact['url'], 'photo' => $apcontact['photo']]);
+                               $apcontact['photo'] = '';
+                       }
                }
 
                // When the photo is too large, try to shorten it by removing parts