X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FOEmbed.php;h=4304bc91a0681368de4bd39896d6efc5a955bf48;hb=66a1e505e3b66ae6dc4884e8b92418ab827cc082;hp=bb3f6290fef15bbb23df212d9aa8812dad8593d4;hpb=70bf75c3424215c4bcec10b208f74253fccfb3b7;p=friendica.git diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index bb3f6290fe..4304bc91a0 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -1,6 +1,6 @@ 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 +104,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, HttpClientAccept::HTML, 15); + if (!empty($html_text)) { $dom = new DOMDocument(); if (@$dom->loadHTML($html_text)) { $xpath = new DOMXPath($dom); @@ -110,7 +118,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 +139,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 +157,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']) && empty($oembed->title)) { - $oembed->title = $data['title']; - } + if (!empty($data['title'])) { + $oembed->title = $data['title']; + } - if (!empty($data['text']) && empty($oembed->description)) { - $oembed->description = $data['text']; - } + if (!empty($data['text'])) { + $oembed->description = $data['text']; + } - if (!empty($data['publisher']) && empty($oembed->provider_name)) { - $oembed->provider_name = $data['publisher']; - } + if (!empty($data['publisher_name'])) { + $oembed->provider_name = $data['publisher_name']; + } - if (!empty($data['publisher_url']) && empty($oembed->provider_url)) { - $oembed->provider_url = $data['publisher_url']; - } + if (!empty($data['publisher_url'])) { + $oembed->provider_url = $data['publisher_url']; + } - if (!empty($data['author']) && empty($oembed->author_name)) { - $oembed->author_name = $data['author']; - } + if (!empty($data['author_name'])) { + $oembed->author_name = $data['author_name']; + } - if (!empty($data['author_url']) && empty($oembed->author_url)) { - $oembed->author_url = $data['author_url']; - } + if (!empty($data['author_url'])) { + $oembed->author_url = $data['author_url']; + } - if (!empty($data['images']) && empty($oembed->thumbnail_url)) { - $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); @@ -198,12 +215,18 @@ class OEmbed return $oembed; } - private static function formatObject(\Friendica\Object\OEmbed $oembed) + /** + * Returns a formatted string from OEmbed object + * + * @param \Friendica\Object\OEmbed $oembed + * @return string + */ + private static function formatObject(\Friendica\Object\OEmbed $oembed): string { $ret = '