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 bf3c113b711f97ea4e35e7841644fddd4c77692d..4e1ae2946f84f442a1b072f4eb07fef68d26f75a 100644 (file)
--- 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;
 
 /**
@@ -73,9 +73,9 @@ class OEmbed
 
                $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'];
@@ -97,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);
@@ -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->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->videowidth,
+                                       'maxwidth' => $a->getThemeInfoValue('videowidth'),
                                        'content' => $json_string,
                                        'created' => DateTimeFormat::utcNow()
                                ], Database::INSERT_UPDATE);
@@ -151,7 +151,7 @@ class OEmbed
 
                // Improve the OEmbed data with data from OpenGraph, Twitter cards and other sources
                if ($use_parseurl) {
-                       $data = ParseUrl::getSiteinfoCached($embedurl, true, false);
+                       $data = ParseUrl::getSiteinfoCached($embedurl, false);
 
                        if (($oembed->type == 'error') && empty($data['title']) && empty($data['text'])) {
                                return $oembed;
@@ -162,7 +162,13 @@ class OEmbed
                                $oembed->type = $data['type'];
 
                                if ($oembed->type == 'photo') {
-                                       $oembed->url = $data['url'];
+                                       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';
+                                       }
                                }
                        }
 
@@ -190,7 +196,7 @@ class OEmbed
                                $oembed->author_url = $data['author_url'];
                        }
 
-                       if (!empty($data['images'])) {
+                       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'];
@@ -230,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;
                }