X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FOEmbed.php;h=4e1ae2946f84f442a1b072f4eb07fef68d26f75a;hb=c376081d0d00218ea494991de1d4a05c3b4c1567;hp=30a113f461414b336fc37dafa3ef0af345aa0204;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 30a113f461..4e1ae2946f 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'];
@@ -95,23 +97,25 @@ class OEmbed
if (!in_array($ext, $noexts)) {
// try oembed autodiscovery
- $html_text = DI::httpRequest()->fetch($embedurl, false, 15, 'text/*');
- if ($html_text) {
- $dom = @DOMDocument::loadHTML($html_text);
- if ($dom) {
+ $html_text = DI::httpClient()->fetch($embedurl, 15, 'text/*');
+ if (!empty($html_text)) {
+ $dom = new DOMDocument();
+ if (@$dom->loadHTML($html_text)) {
$xpath = new DOMXPath($dom);
- $entries = $xpath->query("//link[@type='application/json+oembed']");
- foreach ($entries as $e) {
- $href = $e->getAttributeNode('href')->nodeValue;
- $json_string = DI::httpRequest()->fetch($href . '&maxwidth=' . $a->videowidth);
- break;
- }
-
- $entries = $xpath->query("//link[@type='text/json+oembed']");
- foreach ($entries as $e) {
- $href = $e->getAttributeNode('href')->nodeValue;
- $json_string = DI::httpRequest()->fetch($href . '&maxwidth=' . $a->videowidth);
- break;
+ foreach (
+ $xpath->query("//link[@type='application/json+oembed'] | //link[@type='text/json+oembed']")
+ as $link)
+ {
+ $href = $link->getAttributeNode('href')->nodeValue;
+ // Both Youtube and Vimeo output OEmbed endpoint URL with HTTP
+ // 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::httpClient()->fetchFull($href . '&maxwidth=' . $a->getThemeInfoValue('videowidth'));
+ if ($result->getReturnCode() === 200) {
+ $json_string = $result->getBody();
+ break;
+ }
}
}
}
@@ -128,10 +132,10 @@ 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()
- ], true);
+ ], Database::INSERT_UPDATE);
$cache_ttl = Duration::DAY;
} else {
$cache_ttl = Duration::FIVE_MINUTES;
@@ -140,31 +144,59 @@ class OEmbed
DI::cache()->set($cache_key, $json_string, $cache_ttl);
}
- if ($oembed->type == 'error') {
- return $oembed;
+ // Always embed the SSL version
+ if (!empty($oembed->html)) {
+ $oembed->html = str_replace(['http://www.youtube.com/', 'http://player.vimeo.com/'], ['https://www.youtube.com/', 'https://player.vimeo.com/'], $oembed->html);
}
- // Always embed the SSL version
- $oembed->html = str_replace(['http://www.youtube.com/', 'http://player.vimeo.com/'], ['https://www.youtube.com/', 'https://player.vimeo.com/'], $oembed->html);
+ // Improve the OEmbed data with data from OpenGraph, Twitter cards and other sources
+ if ($use_parseurl) {
+ $data = ParseUrl::getSiteinfoCached($embedurl, false);
- // If fetching information doesn't work, then improve via internal functions
- if ($no_rich_type && ($oembed->type == 'rich')) {
- $data = ParseUrl::getSiteinfoCached($embedurl, true, false);
- $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 (isset($data['title'])) {
+ if (!empty($data['title'])) {
$oembed->title = $data['title'];
}
- if (isset($data['text'])) {
+ if (!empty($data['text'])) {
$oembed->description = $data['text'];
}
- if (!empty($data['images'])) {
+ 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['author_name'])) {
+ $oembed->author_name = $data['author_name'];
+ }
+
+ if (!empty($data['author_url'])) {
+ $oembed->author_url = $data['author_url'];
+ }
+
+ 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'];
@@ -204,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;
}
@@ -336,10 +368,6 @@ class OEmbed
public static function getHTML($url, $title = null)
{
- // Always embed the SSL version
- $url = str_replace(["http://www.youtube.com/", "http://player.vimeo.com/"],
- ["https://www.youtube.com/", "https://player.vimeo.com/"], $url);
-
$o = self::fetchURL($url, !self::isAllowedURL($url));
if (!is_object($o) || property_exists($o, 'type') && $o->type == 'error') {