Merge pull request #11230 from annando/account-type

[friendica.git] / src / Content / OEmbed.php

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 5390a4bc5730165c503a2cb4c4f8612b05221975..4e1ae2946f84f442a1b072f4eb07fef68d26f75a 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -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;
 
 /**
@@ -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->getThemeInfoValue('videowidth'));
+                                                       $result = DI::httpClient()->fetchFull($href . '&maxwidth=' . $a->getThemeInfoValue('videowidth'));
                                                        if ($result->getReturnCode() === 200) {
                                                                $json_string = $result->getBody();
                                                                break;
@@ -236,14 +236,14 @@ class OEmbed
                                break;
 
                        case "photo":
-                               $ret .= '<img width="' . $oembed->width . '" src="' . ProxyUtils::proxifyUrl($oembed->url) . '">';
+                               $ret .= '<img width="' . $oembed->width . '" src="' . Proxy::proxifyUrl($oembed->url) . '">';
                                break;
 
                        case "link":
                                break;
 
                        case "rich":
-                               $ret .= ProxyUtils::proxifyHtml($oembed->html);
+                               $ret .= Proxy::proxifyHtml($oembed->html);
                                break;
                }