friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Rename "fetchUrl" and "fetchUrlFull" to "fetch" and "fetchFull"

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:35:39 +01:00 committed by Hypolite Petovan
parent 72c24efe5b
commit 19b2c8d833
9 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
curweather/curweather.php
View file

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

2
geocoordinates/geocoordinates.php
View file

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

2
geonames/geonames.php
View file

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

2
jappixmini/jappixmini.php
View file

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

2
leistungsschutzrecht/leistungsschutzrecht.php
View file

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

3
mailstream/mailstream.php
View file

@ -13,7 +13,6 @@ use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Network\HTTPRequest;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
function mailstream_install() { function mailstream_install() {
@ -169,7 +168,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
continue; continue;
} }
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
$curlResult = DI::httpRequest()->fetchUrlFull($url, true, 0, '', $cookiejar); $curlResult = DI::httpRequest()->fetchFull($url, true, 0, '', $cookiejar);
$attachments[$url] = [ $attachments[$url] = [
'data' => $curlResult->getBody(), 'data' => $curlResult->getBody(),
'guid' => hash("crc32", $url), 'guid' => hash("crc32", $url),

3
mastodoncustomemojis/mastodoncustomemojis.php
View file

@ -15,7 +15,6 @@ use Friendica\Core\Cache\Duration;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPRequest;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
function mastodoncustomemojis_install() function mastodoncustomemojis_install()
@ -90,7 +89,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
$api_url = $api_base_url . '/api/v1/custom_emojis'; $api_url = $api_base_url . '/api/v1/custom_emojis';
$fetchResult = DI::httpRequest()->fetchUrlFull($api_url); $fetchResult = DI::httpRequest()->fetchFull($api_url);
if ($fetchResult->isSuccess()) { if ($fetchResult->isSuccess()) {
$emojis_array = json_decode($fetchResult->getBody(), true); $emojis_array = json_decode($fetchResult->getBody(), true);

10
statusnet/statusnet.php
View file

@ -154,7 +154,7 @@ function statusnet_settings_post(App $a, $post)
foreach ($globalsn as $asn) { foreach ($globalsn as $asn) {
if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) { if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
$apibase = $asn['apiurl']; $apibase = $asn['apiurl'];
$c = DI::httpRequest()->fetchUrl($apibase . 'statusnet/version.xml'); $c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml');
if (strlen($c) > 0) { if (strlen($c) > 0) {
DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']); DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']); DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
@ -172,7 +172,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 // 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 ;-) // resign quickly after this one try to fix the path ;-)
$apibase = $_POST['statusnet-baseapi']; $apibase = $_POST['statusnet-baseapi'];
$c = DI::httpRequest()->fetchUrl($apibase . 'statusnet/version.xml'); $c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml');
if (strlen($c) > 0) { if (strlen($c) > 0) {
// ok the API path is correct, let's save the settings // ok the API path is correct, let's save the settings
DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@ -182,7 +182,7 @@ function statusnet_settings_post(App $a, $post)
} else { } else {
// the API path is not correct, maybe missing trailing / ? // the API path is not correct, maybe missing trailing / ?
$apibase = $apibase . '/'; $apibase = $apibase . '/';
$c = DI::httpRequest()->fetchUrl($apibase . 'statusnet/version.xml'); $c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml');
if (strlen($c) > 0) { if (strlen($c) > 0) {
// ok the API path is now correct, let's save the settings // ok the API path is now correct, let's save the settings
DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@ -612,7 +612,7 @@ function statusnet_post_hook(App $a, &$b)
} }
if ($image != "") { if ($image != "") {
$img_str = DI::httpRequest()->fetchUrl($image); $img_str = DI::httpRequest()->fetch($image);
$tempfile = tempnam(get_temppath(), "cache"); $tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str); file_put_contents($tempfile, $img_str);
$postdata = ["status" => $msg, "media[]" => $tempfile]; $postdata = ["status" => $msg, "media[]" => $tempfile];
@ -1473,7 +1473,7 @@ function statusnet_convertmsg(App $a, $body)
} elseif ($oembed_data->type != "link") { } elseif ($oembed_data->type != "link") {
$body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body); $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
} else { } else {
$img_str = DI::httpRequest()->fetchUrl($expanded_url, true, 4); $img_str = DI::httpRequest()->fetch($expanded_url, true, 4);
$tempfile = tempnam(get_temppath(), "cache"); $tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str); file_put_contents($tempfile, $img_str);

4
twitter/twitter.php
View file

@ -673,7 +673,7 @@ function twitter_post_hook(App $a, array &$b)
continue; continue;
} }
$img_str = DI::httpRequest()->fetchUrl($image['url']); $img_str = DI::httpRequest()->fetch($image['url']);
$tempfile = tempnam(get_temppath(), 'cache'); $tempfile = tempnam(get_temppath(), 'cache');
file_put_contents($tempfile, $img_str); file_put_contents($tempfile, $img_str);
@ -1317,7 +1317,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
} elseif ($oembed_data->type != 'link') { } elseif ($oembed_data->type != 'link') {
$replace = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]'; $replace = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]';
} else { } else {
$img_str = DI::httpRequest()->fetchUrl($final_url, true, 4); $img_str = DI::httpRequest()->fetch($final_url, true, 4);
$tempfile = tempnam(get_temppath(), 'cache'); $tempfile = tempnam(get_temppath(), 'cache');
file_put_contents($tempfile, $img_str); file_put_contents($tempfile, $img_str);