Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 17:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make "HTTPRequest::curl" dynamic

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:15:46 +01:00 • committed by Hypolite Petovan
parent 9d00e4f1bc
commit 2973ed6448
20 changed files with 72 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Protocol/OStatus.php
View file

@ -39,7 +39,6 @@ use Friendica\Model\Item;
use Friendica\Model\ItemURI;
use Friendica\Model\Tag;
use Friendica\Model\User;
use Friendica\Network\HTTPRequest;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
@ -756,7 +755,7 @@ class OStatus
self::$conv_list[$conversation] = true;
$curlResult = HTTPRequest::curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
$curlResult = DI::httpRequest()->curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
@ -785,7 +784,7 @@ class OStatus
}
}
if ($file != '') {
$conversation_atom = HTTPRequest::curl($attribute['href']);
$conversation_atom = DI::httpRequest()->curl($attribute['href']);
if ($conversation_atom->isSuccess()) {
$xml = $conversation_atom->getBody();
@ -902,7 +901,7 @@ class OStatus
return;
}
$curlResult = HTTPRequest::curl($self);
$curlResult = DI::httpRequest()->curl($self);
if (!$curlResult->isSuccess()) {
return;
@ -949,7 +948,7 @@ class OStatus
}
$stored = false;
$curlResult = HTTPRequest::curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
$curlResult = DI::httpRequest()->curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
@ -980,7 +979,7 @@ class OStatus
}
}
if ($atom_file != '') {
$curlResult = HTTPRequest::curl($atom_file);
$curlResult = DI::httpRequest()->curl($atom_file);
if ($curlResult->isSuccess()) {
Logger::log('Fetched XML for URI ' . $related_uri, Logger::DEBUG);
@ -992,7 +991,7 @@ class OStatus
// Workaround for older GNU Social servers
if (($xml == '') && strstr($related, '/notice/')) {
$curlResult = HTTPRequest::curl(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
$curlResult = DI::httpRequest()->curl(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
if ($curlResult->isSuccess()) {
Logger::log('GNU Social workaround to fetch XML for URI ' . $related_uri, Logger::DEBUG);
@ -1003,7 +1002,7 @@ class OStatus
// Even more worse workaround for GNU Social ;-)
if ($xml == '') {
$related_guess = self::convertHref($related_uri);
$curlResult = HTTPRequest::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
$curlResult = DI::httpRequest()->curl(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
if ($curlResult->isSuccess()) {
Logger::log('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, Logger::DEBUG);