tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10148 from annando/detecting-photo-page

Browse source 
Prevent false "photo" page detection
This commit is contained in:
Hypolite Petovan 2021-04-16 12:27:00 -04:00 committed by GitHub
commit ccf0214411
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Content/OEmbed.php
View file

@ -162,7 +162,13 @@ class OEmbed
$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';
}
}
}
@ -190,7 +196,7 @@ class OEmbed
$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'];

11
src/Util/ParseUrl.php
View file

@ -349,6 +349,9 @@ class ParseUrl
$siteinfo['title'] = trim($list->item(0)->nodeValue);
}
$twitter_card = false;
$twitter_image = false;
$list = $xpath->query('//meta[@name]');
foreach ($list as $node) {
$meta_tag = [];
@ -376,6 +379,7 @@ class ParseUrl
break;
case 'twitter:image':
$siteinfo['image'] = $meta_tag['content'];
$twitter_image = true;
break;
case 'twitter:image:src':
$siteinfo['image'] = $meta_tag['content'];
@ -383,7 +387,7 @@ class ParseUrl
case 'twitter:card':
// Detect photo pages
if ($meta_tag['content'] == 'summary_large_image') {
$siteinfo['type'] = 'photo';
$twitter_card = true;
}
break;
case 'twitter:description':
@ -458,6 +462,7 @@ class ParseUrl
break;
case 'twitter:image':
$siteinfo['image'] = $meta_tag['content'];
$twitter_image = true;
break;
}
}
@ -473,8 +478,8 @@ class ParseUrl
}
// Prevent to have a photo type without an image
if ((empty($siteinfo['image']) || !empty($siteinfo['text'])) && ($siteinfo['type'] == 'photo')) {
$siteinfo['type'] = 'link';
if ($twitter_card && $twitter_image && !empty($siteinfo['image'])) {
$siteinfo['type'] = 'photo';
}
if (!empty($siteinfo['image'])) {