]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/APContact.php
Fix phpcbf style errors in part of code I didn't change
[friendica.git] / src / Model / APContact.php
index 36ca7de446b29fbbb2e32f2b923ff6bf3a1b2a15..215d7e317dcf4a78b973942c87e1b7acc4e07607 100644 (file)
@@ -29,6 +29,7 @@ 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;
@@ -168,7 +169,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;
                        }
@@ -358,12 +359,12 @@ class APContact
                $apcontact['discoverable'] = JsonLD::fetchElement($compacted, 'toot:discoverable', '@value');
 
                if (!empty($apcontact['photo'])) {
-                       $apcontact['photo'] = trim($apcontact['photo']);
-               }
+                       $apcontact['photo'] = Network::addBasePath($apcontact['photo'], $apcontact['url']);
 
-               if (!empty($apcontact['photo']) && !Network::isValidHttpUrl($apcontact['photo'])) {
-                       Logger::warning('Invalid URL for photo', ['url' => $apcontact['url'], 'photo' => $apcontact['photo']]);
-                       $apcontact['photo'] = '';
+                       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