X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=dc062fe5b506afd222a92f7b4f8c75f70d413a0b;hb=52a25ce6181c0b48a978f37a4ae3b94357dbb712;hp=a429a7a5d4a1303d90eac739c7b9bc9a6f7e02a2;hpb=2b513a48c796927bcb028d61a763f47e73598351;p=friendica.git diff --git a/src/Model/APContact.php b/src/Model/APContact.php index a429a7a5d4..dc062fe5b5 100644 --- 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; @@ -202,8 +201,8 @@ class APContact if (!$failed && ($curlResult->getReturnCode() == 410)) { $data = ['@context' => ActivityPub::CONTEXT, 'id' => $url, 'type' => 'Tombstone']; } - } catch (\Throwable $th) { - Logger::notice('Error fetching url', ['url' => $url, 'error' => $th]); + } catch (\Exception $exception) { + Logger::notice('Error fetching url', ['url' => $url, 'exception' => $exception]); $failed = true; } @@ -259,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');