clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename "HTTPRequest::curl()" to HTTPRequest::get()

Browse Source
This commit is contained in:
nupplaPhil
2020-03-04 22:35:09 +01:00
committed by Hypolite Petovan
parent e5649d6dbf
commit 7029012f27
22 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Model/GServer.php
View File

@@ -309,7 +309,7 @@ class GServer
// When a nodeinfo is present, we don't need to dig further
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
$curlResult = DI::httpRequest()->curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
$curlResult = DI::httpRequest()->get($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
if ($curlResult->isTimeout()) {
self::setFailure($url);
return false;
@@ -342,7 +342,7 @@ class GServer
$basedata = ['detection-method' => self::DETECT_MANUAL];
}
$curlResult = DI::httpRequest()->curl($baseurl, false, ['timeout' => $xrd_timeout]);
$curlResult = DI::httpRequest()->get($baseurl, false, ['timeout' => $xrd_timeout]);
if ($curlResult->isSuccess()) {
$basedata = self::analyseRootHeader($curlResult, $basedata);
$basedata = self::analyseRootBody($curlResult, $basedata, $baseurl);
@@ -498,7 +498,7 @@ class GServer
{
Logger::info('Discover relay data', ['server' => $server_url]);
$curlResult = DI::httpRequest()->curl($server_url . '/.well-known/x-social-relay');
$curlResult = DI::httpRequest()->get($server_url . '/.well-known/x-social-relay');
if (!$curlResult->isSuccess()) {
return;
}
@@ -579,7 +579,7 @@ class GServer
*/
private static function fetchStatistics(string $url)
{
$curlResult = DI::httpRequest()->curl($url . '/statistics.json');
$curlResult = DI::httpRequest()->get($url . '/statistics.json');
if (!$curlResult->isSuccess()) {
return [];
}
@@ -689,7 +689,7 @@ class GServer
*/
private static function parseNodeinfo1(string $nodeinfo_url)
{
$curlResult = DI::httpRequest()->curl($nodeinfo_url);
$curlResult = DI::httpRequest()->get($nodeinfo_url);
if (!$curlResult->isSuccess()) {
return [];
@@ -766,7 +766,7 @@ class GServer
*/
private static function parseNodeinfo2(string $nodeinfo_url)
{
$curlResult = DI::httpRequest()->curl($nodeinfo_url);
$curlResult = DI::httpRequest()->get($nodeinfo_url);
if (!$curlResult->isSuccess()) {
return [];
}
@@ -843,7 +843,7 @@ class GServer
*/
private static function fetchSiteinfo(string $url, array $serverdata)
{
$curlResult = DI::httpRequest()->curl($url . '/siteinfo.json');
$curlResult = DI::httpRequest()->get($url . '/siteinfo.json');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
@@ -912,7 +912,7 @@ class GServer
private static function validHostMeta(string $url)
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
$curlResult = DI::httpRequest()->curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
$curlResult = DI::httpRequest()->get($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
if (!$curlResult->isSuccess()) {
return false;
}
@@ -1008,7 +1008,7 @@ class GServer
{
$serverdata['poco'] = '';
$curlResult = DI::httpRequest()->curl($url . '/poco');
$curlResult = DI::httpRequest()->get($url . '/poco');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
@@ -1038,7 +1038,7 @@ class GServer
*/
public static function checkMastodonDirectory(string $url, array $serverdata)
{
$curlResult = DI::httpRequest()->curl($url . '/api/v1/directory?limit=1');
$curlResult = DI::httpRequest()->get($url . '/api/v1/directory?limit=1');
if (!$curlResult->isSuccess()) {
return $serverdata;
}
@@ -1065,7 +1065,7 @@ class GServer
*/
private static function detectNextcloud(string $url, array $serverdata)
{
$curlResult = DI::httpRequest()->curl($url . '/status.php');
$curlResult = DI::httpRequest()->get($url . '/status.php');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
@@ -1099,7 +1099,7 @@ class GServer
*/
private static function detectMastodonAlikes(string $url, array $serverdata)
{
$curlResult = DI::httpRequest()->curl($url . '/api/v1/instance');
$curlResult = DI::httpRequest()->get($url . '/api/v1/instance');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
@@ -1165,7 +1165,7 @@ class GServer
*/
private static function detectHubzilla(string $url, array $serverdata)
{
$curlResult = DI::httpRequest()->curl($url . '/api/statusnet/config.json');
$curlResult = DI::httpRequest()->get($url . '/api/statusnet/config.json');
if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
return $serverdata;
}
@@ -1263,7 +1263,7 @@ class GServer
private static function detectGNUSocial(string $url, array $serverdata)
{
// Test for GNU Social
$curlResult = DI::httpRequest()->curl($url . '/api/gnusocial/version.json');
$curlResult = DI::httpRequest()->get($url . '/api/gnusocial/version.json');
if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
$serverdata['platform'] = 'gnusocial';
@@ -1281,7 +1281,7 @@ class GServer
}
// Test for Statusnet
$curlResult = DI::httpRequest()->curl($url . '/api/statusnet/version.json');
$curlResult = DI::httpRequest()->get($url . '/api/statusnet/version.json');
if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
@@ -1317,9 +1317,9 @@ class GServer
*/
private static function detectFriendica(string $url, array $serverdata)
{
$curlResult = DI::httpRequest()->curl($url . '/friendica/json');
$curlResult = DI::httpRequest()->get($url . '/friendica/json');
if (!$curlResult->isSuccess()) {
$curlResult = DI::httpRequest()->curl($url . '/friendika/json');
$curlResult = DI::httpRequest()->get($url . '/friendika/json');
$friendika = true;
$platform = 'Friendika';
} else {
@@ -1652,7 +1652,7 @@ class GServer
if (!empty($accesstoken)) {
$api = 'https://instances.social/api/1.0/instances/list?count=0';
$header = ['Authorization: Bearer '.$accesstoken];
$curlResult = DI::httpRequest()->curl($api, false, ['headers' => $header]);
$curlResult = DI::httpRequest()->get($api, false, ['headers' => $header]);
if ($curlResult->isSuccess()) {
$servers = json_decode($curlResult->getBody(), true);