friendica/friendica-addons
8
3
Fork 14
Code Issues 3 Pull requests 1 Releases 16 Wiki Activity

Make "HTTPRequest::curl" dynamic

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:15:45 +01:00 committed by Hypolite Petovan
parent 9640142a72
commit 688c556739
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
discourse/discourse.php
View file

@ -17,7 +17,6 @@ use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Network\HTTPRequest;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
@ -115,7 +114,7 @@ function discourse_email_getmessage(App $a, &$message)
function discourse_fetch_post($host, $topic, $pid)
{
$url = $host . '/t/' . $topic . '/' . $pid . '.json';
$curlResult = HTTPRequest::curl($url);
$curlResult = DI::httpRequest()->curl($url);
if (!$curlResult->isSuccess()) {
Logger::info('No success', ['url' => $url]);
return false;
@ -152,7 +151,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
{
$hostaddr = 'https://' . $host;
$url = $hostaddr . '/posts/' . $post . '.json';
$curlResult = HTTPRequest::curl($url);
$curlResult = DI::httpRequest()->curl($url);
if (!$curlResult->isSuccess()) {
return false;
}

3
openstreetmap/openstreetmap.php
View file

@ -14,7 +14,6 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Network\HTTPRequest;
use Friendica\Util\ConfigFileLoader;
use Friendica\Util\Strings;
@ -132,7 +131,7 @@ function openstreetmap_get_coordinates($a, &$b)
$j = DI::cache()->get($cachekey);
if (is_null($j)) {
$curlResult = HTTPRequest::curl($nomserver . $args);
$curlResult = DI::httpRequest()->curl($nomserver . $args);
if ($curlResult->isSuccess()) {
$j = json_decode($curlResult->getBody(), true);
DI::cache()->set($cachekey, $j, Duration::MONTH);

3
pumpio/pumpio.php
View file

@ -19,7 +19,6 @@ use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Network\HTTPRequest;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\ConfigFileLoader;
@ -1605,7 +1604,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
function pumpio_reachable($url)
{
return HTTPRequest::curl($url, false, ['timeout' => 10])->isSuccess();
return DI::httpRequest()->curl($url, false, ['timeout' => 10])->isSuccess();
}
/*