X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FOEmbed.php;h=4e1ae2946f84f442a1b072f4eb07fef68d26f75a;hb=1b73e4d267761d2b717fb30fb972c6e450ecf85e;hp=4e26e45f9404b20a4dba7a8bb00ef349fe5eaa54;hpb=0a3d50a270620c15c901dcfc96be808d4a7c1278;p=friendica.git

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 4e26e45f94..4e1ae2946f 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @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;
 
 /**
@@ -62,19 +62,20 @@ class OEmbed
 	 *
 	 * @param string $embedurl     The URL from which the data should be fetched.
 	 * @param bool   $no_rich_type If set to true rich type content won't be fetched.
+	 * @param bool   $use_parseurl Use the "ParseUrl" functionality to add additional data
 	 *
 	 * @return \Friendica\Object\OEmbed
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function fetchURL($embedurl, $no_rich_type = false)
+	public static function fetchURL($embedurl, bool $no_rich_type = false, bool $use_parseurl = true)
 	{
 		$embedurl = trim($embedurl, '\'"');
 
 		$a = DI::app();
 
-		$cache_key = 'oembed:' . $a->videowidth . ':' . $embedurl;
+		$cache_key = 'oembed:' . $a->getThemeInfoValue('videowidth') . ':' . $embedurl;
 
-		$condition = ['url' => Strings::normaliseLink($embedurl), 'maxwidth' => $a->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'];
@@ -96,8 +97,8 @@ class OEmbed
 
 			if (!in_array($ext, $noexts)) {
 				// try oembed autodiscovery
-				$html_text = DI::httpRequest()->fetch($embedurl, 15, 'text/*');
-				if ($html_text) {
+				$html_text = DI::httpClient()->fetch($embedurl, 15, 'text/*');
+				if (!empty($html_text)) {
 					$dom = new DOMDocument();
 					if (@$dom->loadHTML($html_text)) {
 						$xpath = new DOMXPath($dom);
@@ -110,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->videowidth);
+							$result = DI::httpClient()->fetchFull($href . '&maxwidth=' . $a->getThemeInfoValue('videowidth'));
 							if ($result->getReturnCode() === 200) {
 								$json_string = $result->getBody();
 								break;
@@ -131,7 +132,7 @@ class OEmbed
 			if (!empty($oembed->type) && $oembed->type != 'error') {
 				DBA::insert('oembed', [
 					'url' => Strings::normaliseLink($embedurl),
-					'maxwidth' => $a->videowidth,
+					'maxwidth' => $a->getThemeInfoValue('videowidth'),
 					'content' => $json_string,
 					'created' => DateTimeFormat::utcNow()
 				], Database::INSERT_UPDATE);
@@ -149,48 +150,57 @@ class OEmbed
 		}
 
 		// Improve the OEmbed data with data from OpenGraph, Twitter cards and other sources
-		$data = ParseUrl::getSiteinfoCached($embedurl, true, false);
-		if (($oembed->type == 'error') && empty($data['title']) && empty($data['text'])) {
-			return $oembed;
-		}
+		if ($use_parseurl) {
+			$data = ParseUrl::getSiteinfoCached($embedurl, false);
 
-		if ($no_rich_type || ($oembed->type == 'error')) {
-			$oembed->html = '';
-			$oembed->type = $data['type'];
+			if (($oembed->type == 'error') && empty($data['title']) && empty($data['text'])) {
+				return $oembed;
+			}
 
-			if ($oembed->type == 'photo') {
-				$oembed->url = $data['url'];
+			if ($no_rich_type || ($oembed->type == 'error')) {
+				$oembed->html = '';
+				$oembed->type = $data['type'];
+
+				if ($oembed->type == 'photo') {
+					if (!empty($data['images'])) {
+						$oembed->url = $data['images'][0]['src'];
+						$oembed->width = $data['images'][0]['width'];
+						$oembed->height = $data['images'][0]['height'];
+					} else {
+						$oembed->type = 'link';
+					}
+				}
 			}
-		}
 
-		if (!empty($data['title'])) {
-			$oembed->title = $data['title'];
-		}
+			if (!empty($data['title'])) {
+				$oembed->title = $data['title'];
+			}
 
-		if (!empty($data['text'])) {
-			$oembed->description = $data['text'];
-		}
+			if (!empty($data['text'])) {
+				$oembed->description = $data['text'];
+			}
 
-		if (!empty($data['publisher_name'])) {
-			$oembed->provider_name = $data['publisher_name'];
-		}
+			if (!empty($data['publisher_name'])) {
+				$oembed->provider_name = $data['publisher_name'];
+			}
 
-		if (!empty($data['publisher_url'])) {
-			$oembed->provider_url = $data['publisher_url'];
-		}
+			if (!empty($data['publisher_url'])) {
+				$oembed->provider_url = $data['publisher_url'];
+			}
 
-		if (!empty($data['author_name'])) {
-			$oembed->author_name = $data['author_name'];
-		}
+			if (!empty($data['author_name'])) {
+				$oembed->author_name = $data['author_name'];
+			}
 
-		if (!empty($data['author_url'])) {
-			$oembed->author_url = $data['author_url'];
-		}
+			if (!empty($data['author_url'])) {
+				$oembed->author_url = $data['author_url'];
+			}
 
-		if (!empty($data['images'])) {
-			$oembed->thumbnail_url = $data['images'][0]['src'];
-			$oembed->thumbnail_width = $data['images'][0]['width'];
-			$oembed->thumbnail_height = $data['images'][0]['height'];
+			if (!empty($data['images']) && ($oembed->type != 'photo')) {
+				$oembed->thumbnail_url = $data['images'][0]['src'];
+				$oembed->thumbnail_width = $data['images'][0]['width'];
+				$oembed->thumbnail_height = $data['images'][0]['height'];
+			}
 		}
 
 		Hook::callAll('oembed_fetch_url', $embedurl, $oembed);
@@ -226,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;
 		}