Merge pull request #1161 from nupplaphil/feat/httpclient_followup

[various] Use HTTPRequestOptions constants for HTTPClient::get()

blogger/blogger.php

@@ -208,7 +208,7 @@ EOT;
 		Logger::log('blogger: data: ' . $xml, Logger::DATA);
 
 		if ($bl_blog !== 'test') {
-			$x = DI::httpRequest()->post($bl_blog, $xml)->getBody();
+			$x = DI::httpClient()->post($bl_blog, $xml)->getBody();
 		}
 
 		Logger::log('posted to blogger: ' . (($x) ? $x : ''), Logger::DEBUG);

curweather/curweather.php

@@ -41,7 +41,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	}
 
 	try {
-		$res = new SimpleXMLElement(DI::httpRequest()->fetch($url));
+		$res = new SimpleXMLElement(DI::httpClient()->fetch($url));
 	} catch (Exception $e) {
 		if (empty($_SESSION['curweather_notice_shown'])) {
 			notice(DI::l10n()->t('Error fetching weather data. Error was: ' . $e->getMessage()));

discourse/discourse.php

@@ -114,7 +114,7 @@ function discourse_email_getmessage(App $a, &$message)
 function discourse_fetch_post($host, $topic, $pid)
 {
 	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
-	$curlResult = DI::httpRequest()->get($url);
+	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
 		Logger::info('No success', ['url' => $url]);
 		return false;
@@ -151,7 +151,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 {
 	$hostaddr = 'https://' . $host;
 	$url = $hostaddr . '/posts/' . $post . '.json';
-	$curlResult = DI::httpRequest()->get($url);
+	$curlResult = DI::httpClient()->get($url);
 	if (!$curlResult->isSuccess()) {
 		return false;
 	}

dwpost/dwpost.php

@@ -224,7 +224,7 @@ EOT;
 		Logger::log('dwpost: data: ' . $xml, Logger::DATA);
 
 		if ($dw_blog !== 'test') {
-			$x = DI::httpRequest()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
+			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
 		}
 
 		Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);

geocoordinates/geocoordinates.php

@@ -45,7 +45,7 @@ function geocoordinates_resolve_item(&$item)
 		return;
 	}
 
-	$s = DI::httpRequest()->fetch("https://api.opencagedata.com/geocode/v1/json?q=" . $coords[0] . "," . $coords[1] . "&key=" . $key . "&language=" . $language);
+	$s = DI::httpClient()->fetch("https://api.opencagedata.com/geocode/v1/json?q=" . $coords[0] . "," . $coords[1] . "&key=" . $key . "&language=" . $language);
 
 	if (!$s) {
 		Logger::log("API could not be queried", Logger::DEBUG);

geonames/geonames.php

@@ -77,7 +77,7 @@ function geonames_post_hook(App $a, array &$item)
 
 	/* OK, we're allowed to do our stuff. */
 
-	$s = DI::httpRequest()->fetch('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
+	$s = DI::httpClient()->fetch('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
 
 	if (!$s) {
 		return;

ijpost/ijpost.php

@@ -219,7 +219,7 @@ EOT;
 		Logger::log('ijpost: data: ' . $xml, Logger::DATA);
 
 		if ($ij_blog !== 'test') {
-			$x = DI::httpRequest()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
+			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
 		}
 		Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG);
 	}

jappixmini/jappixmini.php

@@ -644,7 +644,7 @@ function jappixmini_cron(App $a, $d)
 
 			try {
 				// send request
-				$answer_json = DI::httpRequest()->fetch($url);
+				$answer_json = DI::httpClient()->fetch($url);
 
 				// parse answer
 				$answer = json_decode($answer_json);

leistungsschutzrecht/leistungsschutzrecht.php

@@ -72,7 +72,7 @@ function leistungsschutzrecht_fetchsites()
 {
 	// This list works - but question is how current it is
 	$url = "http://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt";
-	$sitelist = DI::httpRequest()->fetch($url);
+	$sitelist = DI::httpClient()->fetch($url);
 	$siteurls = explode(',', $sitelist);
 
 	$whitelist = ['tagesschau.de', 'heute.de', 'wdr.de'];

libertree/libertree.php

@@ -235,7 +235,7 @@ function libertree_send(&$a,&$b) {
 		//	'token' => $ltree_api_token
 		];
 
-		$result = DI::httpRequest()->post($ltree_blog, $params)->getBody();
+		$result = DI::httpClient()->post($ltree_blog, $params)->getBody();
 		Logger::log('libertree: ' . $result);
 	}
 }

ljpost/ljpost.php

@@ -234,7 +234,7 @@ EOT;
 		Logger::log('ljpost: data: ' . $xml, Logger::DATA);
 
 		if ($lj_blog !== 'test') {
-			$x = DI::httpRequest()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
+			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBody();
 		}
 		Logger::log('posted to livejournal: ' . ($x) ? $x : '', Logger::DEBUG);
 	}

mailstream/mailstream.php

@@ -204,7 +204,7 @@ function mailstream_do_images(&$item, &$attachments)
 			continue;
 		}
 		$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
-		$curlResult = DI::httpRequest()->fetchFull($url, 0, '', $cookiejar);
+		$curlResult = DI::httpClient()->fetchFull($url, 0, '', $cookiejar);
 		$attachments[$url] = [
 			'data' => $curlResult->getBody(),
 			'guid' => hash("crc32", $url),

mastodoncustomemojis/mastodoncustomemojis.php

@@ -79,7 +79,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 
 	$api_url = $api_base_url . '/api/v1/custom_emojis';
 
-	$fetchResult = DI::httpRequest()->fetchFull($api_url);
+	$fetchResult = DI::httpClient()->fetchFull($api_url);
 
 	if ($fetchResult->isSuccess()) {
 		$emojis_array = json_decode($fetchResult->getBody(), true);

nominatim/nominatim.php

@@ -43,7 +43,7 @@ function nominatim_resolve_item(&$item)
 		return;
 	}
 
-	$s = DI::httpRequest()->fetch('https://nominatim.openstreetmap.org/reverse?lat=' . $coords[0] . '&lon=' . $coords[1] . '&format=json&addressdetails=0&accept-language=' . $language);
+	$s = DI::httpClient()->fetch('https://nominatim.openstreetmap.org/reverse?lat=' . $coords[0] . '&lon=' . $coords[1] . '&format=json&addressdetails=0&accept-language=' . $language);
 	if (empty($s)) {
 		Logger::info('API could not be queried');
 		return;

openstreetmap/openstreetmap.php

@@ -119,7 +119,7 @@ function openstreetmap_get_coordinates($a, &$b)
 	$j = DI::cache()->get($cachekey);
 
 	if (is_null($j)) {
-		$curlResult = DI::httpRequest()->get($nomserver . $args);
+		$curlResult = DI::httpClient()->get($nomserver . $args);
 		if ($curlResult->isSuccess()) {
 			$j = json_decode($curlResult->getBody(), true);
 			DI::cache()->set($cachekey, $j, Duration::MONTH);

pumpio/pumpio.php

@@ -20,6 +20,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Util\ConfigFileLoader;
@@ -1593,7 +1594,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 
 function pumpio_reachable($url)
 {
-	return DI::httpRequest()->get($url, ['timeout' => 10])->isSuccess();
+	return DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => 10])->isSuccess();
 }
 
 /*

statusnet/statusnet.php

@@ -136,7 +136,7 @@ function statusnet_settings_post(App $a, $post)
 			foreach ($globalsn as $asn) {
 				if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
 					$apibase = $asn['apiurl'];
-					$c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml');
+					$c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml');
 					if (strlen($c) > 0) {
 						DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
 						DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
@@ -154,7 +154,7 @@ function statusnet_settings_post(App $a, $post)
 				//  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
 				//  resign quickly after this one try to fix the path ;-)
 				$apibase = $_POST['statusnet-baseapi'];
-				$c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml');
+				$c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml');
 				if (strlen($c) > 0) {
 					//  ok the API path is correct, let's save the settings
 					DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -164,7 +164,7 @@ function statusnet_settings_post(App $a, $post)
 				} else {
 					//  the API path is not correct, maybe missing trailing / ?
 					$apibase = $apibase . '/';
-					$c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml');
+					$c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml');
 					if (strlen($c) > 0) {
 						//  ok the API path is now correct, let's save the settings
 						DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -597,7 +597,7 @@ function statusnet_post_hook(App $a, &$b)
 		}
 
 		if ($image != "") {
-			$img_str = DI::httpRequest()->fetch($image);
+			$img_str = DI::httpClient()->fetch($image);
 			$tempfile = tempnam(get_temppath(), "cache");
 			file_put_contents($tempfile, $img_str);
 			$postdata = ["status" => $msg, "media[]" => $tempfile];
@@ -1426,7 +1426,7 @@ function statusnet_convertmsg(App $a, $body)
 
 			Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG);
 
-			$expanded_url = DI::httpRequest()->finalUrl($match[1]);
+			$expanded_url = DI::httpClient()->finalUrl($match[1]);
 
 			Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG);
 
@@ -1450,7 +1450,7 @@ function statusnet_convertmsg(App $a, $body)
 			} elseif ($oembed_data->type != "link") {
 				$body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
 			} else {
-				$img_str = DI::httpRequest()->fetch($expanded_url, 4);
+				$img_str = DI::httpClient()->fetch($expanded_url, 4);
 
 				$tempfile = tempnam(get_temppath(), "cache");
 				file_put_contents($tempfile, $img_str);

twitter/twitter.php

@@ -702,7 +702,7 @@ function twitter_post_hook(App $a, array &$b)
 						continue;
 					}
 
-					$img_str = DI::httpRequest()->fetch($image['url']);
+					$img_str = DI::httpClient()->fetch($image['url']);
 
 					$tempfile = tempnam(get_temppath(), 'cache');
 					file_put_contents($tempfile, $img_str);

wppost/wppost.php

@@ -325,7 +325,7 @@ EOT;
 		Logger::log('wppost: data: ' . $xml, Logger::DATA);
 
 		if ($wp_blog !== 'test') {
-			$x = DI::httpRequest()->post($wp_blog, $xml)->getBody();
+			$x = DI::httpClient()->post($wp_blog, $xml)->getBody();
 		}
 		Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG);
 	}