X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FOEmbed.php;h=14e910ebab70e9c853931d4cdd7294142824f66d;hb=409d909d0f52395eae4bebf7960c368efed3865f;hp=7232308738f865bfbf2f4cac6bee7e00d6706318;hpb=c52b8595e84fb2ea3b642b68586d9c9d35561f51;p=friendica.git
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 7232308738..14e910ebab 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -26,7 +26,7 @@ use DOMNode;
use DOMText;
use DOMXPath;
use Exception;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Hook;
use Friendica\Core\Renderer;
use Friendica\Database\Database;
@@ -35,7 +35,7 @@ use Friendica\DI;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
-use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Proxy;
use Friendica\Util\Strings;
/**
@@ -73,9 +73,9 @@ class OEmbed
$a = DI::app();
- $cache_key = 'oembed:' . $a->theme_info['videowidth'] . ':' . $embedurl;
+ $cache_key = 'oembed:' . $a->getThemeInfoValue('videowidth') . ':' . $embedurl;
- $condition = ['url' => Strings::normaliseLink($embedurl), 'maxwidth' => $a->theme_info['videowidth']];
+ $condition = ['url' => Strings::normaliseLink($embedurl), 'maxwidth' => $a->getThemeInfoValue('videowidth')];
$oembed_record = DBA::selectFirst('oembed', ['content'], $condition);
if (DBA::isResult($oembed_record)) {
$json_string = $oembed_record['content'];
@@ -97,7 +97,7 @@ class OEmbed
if (!in_array($ext, $noexts)) {
// try oembed autodiscovery
- $html_text = DI::httpRequest()->fetch($embedurl, 15, 'text/*');
+ $html_text = DI::httpClient()->fetch($embedurl, 15, 'text/*');
if (!empty($html_text)) {
$dom = new DOMDocument();
if (@$dom->loadHTML($html_text)) {
@@ -111,7 +111,7 @@ class OEmbed
// but their OEmbed endpoint is only accessible by HTTPS ¯\_(ã)_/¯
$href = str_replace(['http://www.youtube.com/', 'http://player.vimeo.com/'],
['https://www.youtube.com/', 'https://player.vimeo.com/'], $href);
- $result = DI::httpRequest()->fetchFull($href . '&maxwidth=' . $a->theme_info['videowidth']);
+ $result = DI::httpClient()->fetchFull($href . '&maxwidth=' . $a->getThemeInfoValue('videowidth'));
if ($result->getReturnCode() === 200) {
$json_string = $result->getBody();
break;
@@ -132,7 +132,7 @@ class OEmbed
if (!empty($oembed->type) && $oembed->type != 'error') {
DBA::insert('oembed', [
'url' => Strings::normaliseLink($embedurl),
- 'maxwidth' => $a->theme_info['videowidth'],
+ 'maxwidth' => $a->getThemeInfoValue('videowidth'),
'content' => $json_string,
'created' => DateTimeFormat::utcNow()
], Database::INSERT_UPDATE);
@@ -236,14 +236,14 @@ class OEmbed
break;
case "photo":
- $ret .= '
';
+ $ret .= '
';
break;
case "link":
break;
case "rich":
- $ret .= ProxyUtils::proxifyHtml($oembed->html);
+ $ret .= Proxy::proxifyHtml($oembed->html);
break;
}