X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=dc062fe5b506afd222a92f7b4f8c75f70d413a0b;hb=52a25ce6181c0b48a978f37a4ae3b94357dbb712;hp=215d7e317dcf4a78b973942c87e1b7acc4e07607;hpb=5bba6dd4b7fdb62250d89580ac95c34d45a0ddbb;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 215d7e317d..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;
@@ -189,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) {
@@ -254,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');