friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-15 12:58:49 +00:00
Code Issues Releases Wiki Activity

Make "HTTPRequest::curl" dynamic

Browse source
This commit is contained in:
nupplaPhil 2020-03-04 22:15:45 +01:00
parent fe940a7cfb
commit a00023fd2a
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
discourse/discourse.php
View file

@ -7,19 +7,18 @@
* Author: Michael Vogel <http://pirati.ca/profile/heluecht> * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
* *
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Content\Text\Markdown; use Friendica\Util\DateTimeFormat;
use Friendica\Network\HTTPRequest;
use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
Use Friendica\Util\DateTimeFormat;
/* Todo: /* Todo:
* - Obtaining API tokens to be able to read non public posts as well * - 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) function discourse_fetch_post($host, $topic, $pid)
{ {
$url = $host . '/t/' . $topic . '/' . $pid . '.json'; $url = $host . '/t/' . $topic . '/' . $pid . '.json';
$curlResult = HTTPRequest::curl($url); $curlResult = DI::httpRequest()->curl($url);
if (!$curlResult->isSuccess()) { if (!$curlResult->isSuccess()) {
Logger::info('No success', ['url' => $url]); Logger::info('No success', ['url' => $url]);
return false; return false;
@ -152,7 +151,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
{ {
$hostaddr = 'https://' . $host; $hostaddr = 'https://' . $host;
$url = $hostaddr . '/posts/' . $post . '.json'; $url = $hostaddr . '/posts/' . $post . '.json';
$curlResult = HTTPRequest::curl($url); $curlResult = DI::httpRequest()->curl($url);
if (!$curlResult->isSuccess()) { if (!$curlResult->isSuccess()) {
return false; return false;
} }

6
openstreetmap/openstreetmap.php
View file

@ -9,14 +9,12 @@
* *
*/ */
use Friendica\DI;
use Friendica\Core\Cache\Duration; use Friendica\Core\Cache\Duration;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Network\HTTPRequest; use Friendica\DI;
use Friendica\Util\ConfigFileLoader; use Friendica\Util\ConfigFileLoader;
use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
const OSM_TMS = 'https://www.openstreetmap.org'; const OSM_TMS = 'https://www.openstreetmap.org';
@ -133,7 +131,7 @@ function openstreetmap_get_coordinates($a, &$b)
$j = DI::cache()->get($cachekey); $j = DI::cache()->get($cachekey);
if (is_null($j)) { if (is_null($j)) {
$curlResult = HTTPRequest::curl($nomserver . $args); $curlResult = DI::httpRequest()->curl($nomserver . $args);
if ($curlResult->isSuccess()) { if ($curlResult->isSuccess()) {
$j = json_decode($curlResult->getBody(), true); $j = json_decode($curlResult->getBody(), true);
DI::cache()->set($cachekey, $j, Duration::MONTH); DI::cache()->set($cachekey, $j, Duration::MONTH);

4
pumpio/pumpio.php
View file

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