From a00023fd2a8a4e3a5318c7fb30ccac0f51812937 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Wed, 4 Mar 2020 22:15:45 +0100
Subject: [PATCH] Make "HTTPRequest::curl" dynamic

---
 discourse/discourse.php         | 13 ++++++-------
 openstreetmap/openstreetmap.php |  6 ++----
 pumpio/pumpio.php               |  4 +---
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/discourse/discourse.php b/discourse/discourse.php
index 8d6b6624..cf741409 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -7,19 +7,18 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  *
  */
+
 use Friendica\App;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Content\Text\Markdown;
-use Friendica\Network\HTTPRequest;
-use Friendica\Util\Network;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
-Use Friendica\Util\DateTimeFormat;
 
 /* Todo:
  * - Obtaining API tokens to be able to read non public posts as well
@@ -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;
 	}
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 7cddb24e..ede71ccd 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,14 +9,12 @@
  *
  */
 
-use Friendica\DI;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Network\HTTPRequest;
+use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';
@@ -133,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);
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 4fe1390f..aaa8d0bf 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -19,12 +19,10 @@ 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;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -1611,7 +1609,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();
 }
 
 /*