EntropyEngineer/friendica-addons
0
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Make "HTTPRequest::fetchUrl" dynamic

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:20:27 +01:00 committed by Hypolite Petovan
parent fed6e3cde1
commit 40ff1d7fda
7 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
curweather/curweather.php
View file

@ -15,7 +15,6 @@ use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPRequest;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
function curweather_install() function curweather_install()
@ -49,7 +48,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
} }
try { try {
$res = new SimpleXMLElement(HTTPRequest::fetchUrl($url)); $res = new SimpleXMLElement(DI::httpRequest()->fetchUrl($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()));

3
geocoordinates/geocoordinates.php
View file

@ -10,7 +10,6 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPRequest;
use Friendica\Util\Strings; use Friendica\Util\Strings;
function geocoordinates_install() function geocoordinates_install()
@ -53,7 +52,7 @@ function geocoordinates_resolve_item(&$item)
return; return;
} }
$s = HTTPRequest::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=" . $coords[0] . "," . $coords[1] . "&key=" . $key . "&language=" . $language); $s = DI::httpRequest()->fetchUrl("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);

3
geonames/geonames.php
View file

@ -11,7 +11,6 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPRequest;
use Friendica\Util\ConfigFileLoader; use Friendica\Util\ConfigFileLoader;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -78,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 = HTTPRequest::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account); $s = DI::httpRequest()->fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
if (!$s) { if (!$s) {
return; return;

3
jappixmini/jappixmini.php
View file

@ -69,7 +69,6 @@ use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\HTTPRequest;
function jappixmini_install() function jappixmini_install()
{ {
@ -660,7 +659,7 @@ function jappixmini_cron(App $a, $d)
try { try {
// send request // send request
$answer_json = HTTPRequest::fetchUrl($url); $answer_json = DI::httpRequest()->fetchUrl($url);
// parse answer // parse answer
$answer = json_decode($answer_json); $answer = json_decode($answer_json);

3
leistungsschutzrecht/leistungsschutzrecht.php
View file

@ -9,7 +9,6 @@
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\DI; use Friendica\DI;
use Friendica\Network\HTTPRequest;
function leistungsschutzrecht_install() { function leistungsschutzrecht_install() {
Hook::register('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron'); Hook::register('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron');
@ -80,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 = HTTPRequest::fetchUrl($url); $sitelist = DI::httpRequest()->fetchUrl($url);
$siteurls = explode(',', $sitelist); $siteurls = explode(',', $sitelist);
$whitelist = ['tagesschau.de', 'heute.de', 'wdr.de']; $whitelist = ['tagesschau.de', 'heute.de', 'wdr.de'];

11
statusnet/statusnet.php
View file

@ -55,7 +55,6 @@ use Friendica\Model\Item;
use Friendica\Model\ItemContent; use Friendica\Model\ItemContent;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\HTTPRequest;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
@ -156,7 +155,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 = HTTPRequest::fetchUrl($apibase . 'statusnet/version.xml'); $c = DI::httpRequest()->fetchUrl($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']);
@ -174,7 +173,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 = HTTPRequest::fetchUrl($apibase . 'statusnet/version.xml'); $c = DI::httpRequest()->fetchUrl($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']);
@ -184,7 +183,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 = HTTPRequest::fetchUrl($apibase . 'statusnet/version.xml'); $c = DI::httpRequest()->fetchUrl($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']);
@ -614,7 +613,7 @@ function statusnet_post_hook(App $a, &$b)
} }
if ($image != "") { if ($image != "") {
$img_str = HTTPRequest::fetchUrl($image); $img_str = DI::httpRequest()->fetchUrl($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];
@ -1475,7 +1474,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 = HTTPRequest::fetchUrl($expanded_url, true, 4); $img_str = DI::httpRequest()->fetchUrl($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);

5
twitter/twitter.php
View file

@ -85,7 +85,6 @@ use Friendica\Model\ItemContent;
use Friendica\Model\ItemURI; use Friendica\Model\ItemURI;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\HTTPRequest;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\ConfigFileLoader; use Friendica\Util\ConfigFileLoader;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -675,7 +674,7 @@ function twitter_post_hook(App $a, array &$b)
continue; continue;
} }
$img_str = HTTPRequest::fetchUrl($image['url']); $img_str = DI::httpRequest()->fetchUrl($image['url']);
$tempfile = tempnam(get_temppath(), 'cache'); $tempfile = tempnam(get_temppath(), 'cache');
file_put_contents($tempfile, $img_str); file_put_contents($tempfile, $img_str);
@ -1319,7 +1318,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 = HTTPRequest::fetchUrl($final_url, true, 4); $img_str = DI::httpRequest()->fetchUrl($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);