Move post/curl/fetchUrl/fetchUrlFull to own class "Network\HTTPRequest"

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

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 3d268c37b91f699bb0c4950f2c64636b9d828901..80ef201a8a134f6d57263efeddf77f2fabe34793 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -23,20 +23,21 @@ namespace Friendica\Model;
 
 use DOMDocument;
 use DOMXPath;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
 use Friendica\Network\CurlResult;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
-use Friendica\Core\Logger;
-use Friendica\Core\System;
-use Friendica\Protocol\PortableContact;
-use Friendica\Protocol\Diaspora;
 
 /**
  * This class handles GServer related functions
@@ -309,7 +310,7 @@ class GServer
 
                // When a nodeinfo is present, we don't need to dig further
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = Network::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
+               $curlResult = HTTPRequest::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
                if ($curlResult->isTimeout()) {
                        self::setFailure($url);
                        return false;
@@ -342,7 +343,7 @@ class GServer
                                        $basedata = ['detection-method' => self::DETECT_MANUAL];
                                }
 
-                               $curlResult = Network::curl($baseurl, false, ['timeout' => $xrd_timeout]);
+                               $curlResult = HTTPRequest::curl($baseurl, false, ['timeout' => $xrd_timeout]);
                                if ($curlResult->isSuccess()) {
                                        $basedata = self::analyseRootHeader($curlResult, $basedata);
                                        $basedata = self::analyseRootBody($curlResult, $basedata, $baseurl);
@@ -498,7 +499,7 @@ class GServer
        {
                Logger::info('Discover relay data', ['server' => $server_url]);
 
-               $curlResult = Network::curl($server_url . '/.well-known/x-social-relay');
+               $curlResult = HTTPRequest::curl($server_url . '/.well-known/x-social-relay');
                if (!$curlResult->isSuccess()) {
                        return;
                }
@@ -579,7 +580,7 @@ class GServer
         */
        private static function fetchStatistics(string $url)
        {
-               $curlResult = Network::curl($url . '/statistics.json');
+               $curlResult = HTTPRequest::curl($url . '/statistics.json');
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -689,7 +690,8 @@ class GServer
         */
        private static function parseNodeinfo1(string $nodeinfo_url)
        {
-               $curlResult = Network::curl($nodeinfo_url);
+               $curlResult = HTTPRequest::curl($nodeinfo_url);
+
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -765,7 +767,7 @@ class GServer
         */
        private static function parseNodeinfo2(string $nodeinfo_url)
        {
-               $curlResult = Network::curl($nodeinfo_url);
+               $curlResult = HTTPRequest::curl($nodeinfo_url);
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -842,7 +844,7 @@ class GServer
         */
        private static function fetchSiteinfo(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/siteinfo.json');
+               $curlResult = HTTPRequest::curl($url . '/siteinfo.json');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -911,7 +913,7 @@ class GServer
        private static function validHostMeta(string $url)
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = Network::curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
+               $curlResult = HTTPRequest::curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -1007,7 +1009,7 @@ class GServer
        {
                $serverdata['poco'] = '';
 
-               $curlResult = Network::curl($url. '/poco');
+               $curlResult = HTTPRequest::curl($url . '/poco');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -1037,7 +1039,7 @@ class GServer
         */
        public static function checkMastodonDirectory(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/api/v1/directory?limit=1');
+               $curlResult = HTTPRequest::curl($url . '/api/v1/directory?limit=1');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -1064,7 +1066,8 @@ class GServer
         */
        private static function detectNextcloud(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/status.php');
+               $curlResult = HTTPRequest::curl($url . '/status.php');
+
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
@@ -1097,7 +1100,8 @@ class GServer
         */
        private static function detectMastodonAlikes(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/api/v1/instance');
+               $curlResult = HTTPRequest::curl($url . '/api/v1/instance');
+
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
@@ -1162,7 +1166,7 @@ class GServer
         */
        private static function detectHubzilla(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/api/statusnet/config.json');
+               $curlResult = HTTPRequest::curl($url . '/api/statusnet/config.json');
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
@@ -1260,7 +1264,7 @@ class GServer
        private static function detectGNUSocial(string $url, array $serverdata)
        {
                // Test for GNU Social
-               $curlResult = Network::curl($url . '/api/gnusocial/version.json');
+               $curlResult = HTTPRequest::curl($url . '/api/gnusocial/version.json');
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
                        $serverdata['platform'] = 'gnusocial';
@@ -1278,7 +1282,7 @@ class GServer
                }
 
                // Test for Statusnet
-               $curlResult = Network::curl($url . '/api/statusnet/version.json');
+               $curlResult = HTTPRequest::curl($url . '/api/statusnet/version.json');
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
 
@@ -1314,9 +1318,9 @@ class GServer
         */
        private static function detectFriendica(string $url, array $serverdata)
        {
-               $curlResult = Network::curl($url . '/friendica/json');
+               $curlResult = HTTPRequest::curl($url . '/friendica/json');
                if (!$curlResult->isSuccess()) {
-                       $curlResult = Network::curl($url . '/friendika/json');
+                       $curlResult = HTTPRequest::curl($url . '/friendika/json');
                        $friendika = true;
                        $platform = 'Friendika';
                } else {
@@ -1631,13 +1635,12 @@ class GServer
                $protocols = ['activitypub', 'diaspora', 'dfrn', 'ostatus'];
                foreach ($protocols as $protocol) {
                        $query = '{nodes(protocol:"' . $protocol . '"){host}}';
-                       $curlResult = Network::fetchUrl('https://the-federation.info/graphql?query=' . urlencode($query));
+                       $curlResult = HTTPRequest::fetchUrl('https://the-federation.info/graphql?query=' . urlencode($query));
                        if (!empty($curlResult)) {
                                $data = json_decode($curlResult, true);
                                if (!empty($data['data']['nodes'])) {
                                        foreach ($data['data']['nodes'] as $server) {
                                                // Using "only_nodeinfo" since servers that are listed on that page should always have it.
-                                               echo $server['host']."\n";
                                                Worker::add(PRIORITY_LOW, 'UpdateGServer', 'https://' . $server['host'], true);
                                        }
                                }
@@ -1650,7 +1653,8 @@ class GServer
                if (!empty($accesstoken)) {
                        $api = 'https://instances.social/api/1.0/instances/list?count=0';
                        $header = ['Authorization: Bearer '.$accesstoken];
-                       $curlResult = Network::curl($api, false, ['headers' => $header]);
+                       $curlResult = HTTPRequest::curl($api, false, ['headers' => $header]);
+
                        if ($curlResult->isSuccess()) {
                                $servers = json_decode($curlResult->getBody(), true);