Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 06:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13960 from annando/oembed-full-cleanup

Browse source 
Oembed: Some more cleanup
This commit is contained in:
Hypolite Petovan 2024-03-03 13:41:35 -05:00 committed by GitHub
commit f4826bae52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/OEmbed.php
View file

@ -225,7 +225,7 @@ class OEmbed
'$turl' => BBCode::proxyUrl($oembed->thumbnail_url, BBCode::INTERNAL, $uriid, Proxy::SIZE_SMALL), '$turl' => BBCode::proxyUrl($oembed->thumbnail_url, BBCode::INTERNAL, $uriid, Proxy::SIZE_SMALL),
]); ]);
} else { } else {
$ret = $oembed->html; $ret .= Proxy::proxifyHtml($oembed->html, $uriid);
} }
break; break;

2
src/Model/Post/Media.php
View file

@ -365,7 +365,7 @@ class Media
*/ */
private static function addPage(array $media): array private static function addPage(array $media): array
{ {
$data = ParseUrl::getSiteinfoCached($media['url'], false); $data = ParseUrl::getSiteinfoCached($media['url']);
$media['preview'] = $data['images'][0]['src'] ?? null; $media['preview'] = $data['images'][0]['src'] ?? null;
$media['preview-height'] = $data['images'][0]['height'] ?? null; $media['preview-height'] = $data['images'][0]['height'] ?? null;
$media['preview-width'] = $data['images'][0]['width'] ?? null; $media['preview-width'] = $data['images'][0]['width'] ?? null;

3
src/Util/ParseUrl.php
View file

@ -23,7 +23,6 @@ namespace Friendica\Util;
use DOMDocument; use DOMDocument;
use DOMXPath; use DOMXPath;
use Friendica\Content\OEmbed;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
use Friendica\Protocol\HTTP\MediaType; use Friendica\Protocol\HTTP\MediaType;
use Friendica\Core\Hook; use Friendica\Core\Hook;
@ -165,8 +164,6 @@ class ParseUrl
* \<meta name="description" content="An awesome description"\> * \<meta name="description" content="An awesome description"\>
* *
* @param string $url The url of the page which should be scraped * @param string $url The url of the page which should be scraped
* @param bool $do_oembed The false option is used by the function fetch_oembed()
* to avoid endless loops
* @param int $count Internal counter to avoid endless loops * @param int $count Internal counter to avoid endless loops
* *
* @return array which contains needed data for embedding * @return array which contains needed data for embedding