From f36ca4fcf44ccc756061eefebf43116713b7c66e Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Wed, 4 Mar 2020 22:30:24 +0100 Subject: [PATCH] Move "Network::finalUrl" to "HTTPRequest" class --- statusnet/statusnet.php | 3 +-- twitter/twitter.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index a204f3e3..24030ce6 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -57,7 +57,6 @@ use Friendica\Model\Photo; use Friendica\Model\User; use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\Strings; function statusnet_install() @@ -1450,7 +1449,7 @@ function statusnet_convertmsg(App $a, $body) Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG); - $expanded_url = Network::finalUrl($match[1]); + $expanded_url = HTTPRequest::finalUrl($match[1]); Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG); diff --git a/twitter/twitter.php b/twitter/twitter.php index f93b12b4..cea39842 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -89,7 +89,6 @@ use Friendica\Protocol\Activity; use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; use Friendica\Util\Images; -use Friendica\Util\Network; use Friendica\Util\Strings; require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; @@ -1297,7 +1296,7 @@ function twitter_expand_entities($body, stdClass $status, $picture) $expanded_url = $url->expanded_url; - $final_url = Network::finalUrl($url->expanded_url); + $final_url = HTTPRequest::finalUrl($url->expanded_url); $oembed_data = OEmbed::fetchURL($final_url); -- 2.39.5