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

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

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:07:05 +01:00 • committed by Hypolite Petovan
parent 2889d59b83
commit 5344efef71
43 changed files with 528 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Protocol/OStatus.php
View file

@ -39,10 +39,10 @@ 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;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\XML;
@ -756,7 +756,7 @@ class OStatus
self::$conv_list[$conversation] = true;
$curlResult = Network::curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
$curlResult = HTTPRequest::curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
@ -785,7 +785,7 @@ class OStatus
}
}
if ($file != '') {
$conversation_atom = Network::curl($attribute['href']);
$conversation_atom = HTTPRequest::curl($attribute['href']);
if ($conversation_atom->isSuccess()) {
$xml = $conversation_atom->getBody();
@ -902,7 +902,7 @@ class OStatus
return;
}
$curlResult = Network::curl($self);
$curlResult = HTTPRequest::curl($self);
if (!$curlResult->isSuccess()) {
return;
@ -949,7 +949,7 @@ class OStatus
}
$stored = false;
$curlResult = Network::curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
$curlResult = HTTPRequest::curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
@ -980,7 +980,7 @@ class OStatus
}
}
if ($atom_file != '') {
$curlResult = Network::curl($atom_file);
$curlResult = HTTPRequest::curl($atom_file);
if ($curlResult->isSuccess()) {
Logger::log('Fetched XML for URI ' . $related_uri, Logger::DEBUG);
@ -992,7 +992,7 @@ class OStatus
// Workaround for older GNU Social servers
if (($xml == '') && strstr($related, '/notice/')) {
$curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related).'.atom');
$curlResult = 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 +1003,7 @@ class OStatus
// Even more worse workaround for GNU Social ;-)
if ($xml == '') {
$related_guess = self::convertHref($related_uri);
$curlResult = Network::curl(str_replace('/notice/', '/api/statuses/show/', $related_guess).'.atom');
$curlResult = 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);