<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
$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'];
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);
// 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;
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);
$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';
+ }
}
}
$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'];