forked from friendica/friendica-addons
Move "Network::finalUrl" to "HTTPRequest" class
This commit is contained in:
parent
40ff1d7fda
commit
f36ca4fcf4
|
@ -57,7 +57,6 @@ use Friendica\Model\Photo;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
use Friendica\Protocol\Activity;
|
use Friendica\Protocol\Activity;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Network;
|
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
|
||||||
function statusnet_install()
|
function statusnet_install()
|
||||||
|
@ -1450,7 +1449,7 @@ function statusnet_convertmsg(App $a, $body)
|
||||||
|
|
||||||
Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG);
|
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);
|
Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG);
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,6 @@ use Friendica\Protocol\Activity;
|
||||||
use Friendica\Util\ConfigFileLoader;
|
use Friendica\Util\ConfigFileLoader;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Images;
|
use Friendica\Util\Images;
|
||||||
use Friendica\Util\Network;
|
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
|
||||||
require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
|
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;
|
$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);
|
$oembed_data = OEmbed::fetchURL($final_url);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue