X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FOEmbed.php;h=4e1ae2946f84f442a1b072f4eb07fef68d26f75a;hb=1b73e4d267761d2b717fb30fb972c6e450ecf85e;hp=4bcb485fcf50ad039adf527c4a13576466e1f64a;hpb=fa39a455a759d223d2993950ec9ed555b3046b2b;p=friendica.git diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 4bcb485fcf..4e1ae2946f 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -1,8 +1,24 @@ . + * */ + namespace Friendica\Content; use DOMDocument; @@ -10,17 +26,16 @@ use DOMNode; use DOMText; use DOMXPath; use Exception; -use Friendica\Core\Cache\Cache; -use Friendica\Core\Config; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Database\Database; use Friendica\Database\DBA; 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; /** @@ -30,8 +45,6 @@ use Friendica\Util\Strings; * third party sites * * @see https://oembed.com - * - * @author Hypolite Petovan */ class OEmbed { @@ -45,23 +58,24 @@ class OEmbed } /** - * @brief Get data from an URL to embed its content. + * Get data from an URL to embed its content. * * @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']; @@ -83,23 +97,25 @@ class OEmbed if (!in_array($ext, $noexts)) { // try oembed autodiscovery - $html_text = Network::fetchUrl($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 = Network::fetchUrl($href . '&maxwidth=' . $a->videowidth); - break; - } - - $entries = $xpath->query("//link[@type='text/json+oembed']"); - foreach ($entries as $e) { - $href = $e->getAttributeNode('href')->nodeValue; - $json_string = Network::fetchUrl($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; + } } } } @@ -116,43 +132,71 @@ 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); - $cache_ttl = Cache::DAY; + ], Database::INSERT_UPDATE); + $cache_ttl = Duration::DAY; } else { - $cache_ttl = Cache::FIVE_MINUTES; + $cache_ttl = Duration::FIVE_MINUTES; } 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']; @@ -192,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; } @@ -249,9 +293,9 @@ class OEmbed public static function BBCode2HTML($text) { - $stopoembed = Config::get("system", "no_oembed"); + $stopoembed = DI::config()->get("system", "no_oembed"); if ($stopoembed == true) { - return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "" . L10n::t('Embedding disabled') . " : $1", $text); + return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "" . DI::l10n()->t('Embedding disabled') . " : $1", $text); } return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", ['self', 'replaceCallback'], $text); } @@ -297,14 +341,13 @@ class OEmbed /** * Determines if rich content OEmbed is allowed for the provided URL * - * @brief Determines if rich content OEmbed is allowed for the provided URL * @param string $url * @return boolean * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function isAllowedURL($url) { - if (!Config::get('system', 'no_oembed_rich_content')) { + if (!DI::config()->get('system', 'no_oembed_rich_content')) { return true; } @@ -313,7 +356,7 @@ class OEmbed return false; } - $str_allowed = Config::get('system', 'allowed_oembed', ''); + $str_allowed = DI::config()->get('system', 'allowed_oembed', ''); if (empty($str_allowed)) { return false; } @@ -325,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') { @@ -345,7 +384,7 @@ class OEmbed } /** - * @brief Generates the iframe HTML for an oembed attachment. + * Generates the iframe HTML for an oembed attachment. * * Width and height are given by the remote, and are regularly too small for * the generated iframe. @@ -374,15 +413,15 @@ class OEmbed $width = '100%'; $src = DI::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src); - return ''; + return ''; } /** + * Generates attribute search XPath string + * * Generates an XPath query to select elements whose provided attribute contains * the provided value in a space-separated list. * - * @brief Generates attribute search XPath string - * * @param string $attr Name of the attribute to seach * @param string $value Value to search in a space-separated list * @return string @@ -396,8 +435,6 @@ class OEmbed /** * Returns the inner XML string of a provided DOMNode * - * @brief Returns the inner XML string of a provided DOMNode - * * @param DOMNode $node * @return string */