Simplify code

[friendica.git] / src / Network / Probe.php

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 4aa50b4be5a71b91438ab7025192a106314e6349..10d03fa038a755bbbd3583be010441a4fb0f449a 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -34,6 +34,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GServer;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -170,7 +171,7 @@ class Probe
                Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
                $xrd = null;
 
-               $curlResult = DI::httpClient()->get($ssl_url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+               $curlResult = DI::httpClient()->get($ssl_url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
                $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                if ($curlResult->isSuccess()) {
                        $xml = $curlResult->getBody();
@@ -187,7 +188,7 @@ class Probe
                }
 
                if (!is_object($xrd) && !empty($url)) {
-                       $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+                       $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
                        $connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                        if ($curlResult->isTimeout()) {
                                Logger::info('Probing timeout', ['url' => $url]);
@@ -429,7 +430,7 @@ class Probe
         */
        private static function getHideStatus($url)
        {
-               $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
+               $curlResult = DI::httpClient()->get($url, [HttpClientOptions::CONTENT_LENGTH => 1000000]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -950,7 +951,7 @@ class Probe
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-               $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
+               $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout, HttpClientOptions::ACCEPT_CONTENT => [$type]]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1995,8 +1996,6 @@ class Probe
                                                        $data["name"] .= $perspart->text;
                                                }
                                        }
-
-                                       $data["name"] = Strings::escapeTags($data["name"]);
                                }
                        }
                }
@@ -2229,29 +2228,29 @@ class Probe
                                throw new HTTPException\NotFoundException('User not found.');
                        }
 
-                       $profile   = User::getOwnerDataById($uid);
+                       $owner     = User::getOwnerDataById($uid);
                        $approfile = ActivityPub\Transmitter::getProfile($uid);
 
-                       if (empty($profile['gsid'])) {
-                               $profile['gsid'] = GServer::getID($approfile['generator']['url']);
+                       if (empty($owner['gsid'])) {
+                               $owner['gsid'] = GServer::getID($approfile['generator']['url']);
                        }
 
                        $data = [
-                               'name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
-                               'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
-                               'photo' => User::getAvatarUrlForId($uid),
-                               'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '',
-                               'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
-                               'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
-                               'xmpp' => $profile['xmpp'], 'matrix' => $profile['matrix'],
-                               'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
-                               'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
-                               'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'],
+                               'name' => $owner['name'], 'nick' => $owner['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
+                               'url' => $owner['url'], 'addr' => $owner['addr'], 'alias' => $owner['alias'],
+                               'photo' => User::getAvatarUrl($owner),
+                               'header' => $owner['header'] ? Contact::getHeaderUrlForId($owner['id'], $owner['updated']) : '',
+                               'account-type' => $owner['contact-type'], 'community' => ($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+                               'keywords' => $owner['keywords'], 'location' => $owner['location'], 'about' => $owner['about'],
+                               'xmpp' => $owner['xmpp'], 'matrix' => $owner['matrix'],
+                               'hide' => !$owner['net-publish'], 'batch' => '', 'notify' => $owner['notify'],
+                               'poll' => $owner['poll'], 'request' => $owner['request'], 'confirm' => $owner['confirm'],
+                               'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $owner['poco'],
                                'following' => $approfile['following'], 'followers' => $approfile['followers'],
                                'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
                                'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
-                               'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
-                               'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
+                               'pubkey' => $owner['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $owner['gsid'],
+                               'manually-approve' => in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
                        ];
                } catch (Exception $e) {
                        // Default values for non existing targets