Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 02:30:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Replace IHTTPResult for CurlResult usages"

Browse source 
This reverts commit 97167d7b
This commit is contained in:
Philipp 2020-10-11 23:26:17 +02:00
parent 0aaad3e392
commit b70b9d1139
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
4 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Model/GServer.php
View file

@ -30,7 +30,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\Register;
use Friendica\Network\IHTTPResult;
use Friendica\Network\CurlResult;
use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
@ -630,19 +630,18 @@ class GServer
/**
* Detect server type by using the nodeinfo data
*
* @param string $url address of the server
* @param IHTTPResult $httpResult
*
* @param string $url address of the server
* @param CurlResult $curlResult
* @return array Server data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function fetchNodeinfo(string $url, IHTTPResult $httpResult)
private static function fetchNodeinfo(string $url, CurlResult $curlResult)
{
if (!$httpResult->isSuccess()) {
if (!$curlResult->isSuccess()) {
return [];
}
$nodeinfo = json_decode($httpResult->getBody(), true);
$nodeinfo = json_decode($curlResult->getBody(), true);
if (!is_array($nodeinfo) || empty($nodeinfo['links'])) {
return [];