$siteinfo['type'] = $oembed_data->type;
}
- if (($oembed_data->type == 'link') && ($siteinfo['type'] != 'photo')) {
+ // See https://github.com/friendica/friendica/pull/5763#discussion_r217913178
+ if ($siteinfo['type'] != 'photo') {
if (isset($oembed_data->title)) {
$siteinfo['title'] = trim($oembed_data->title);
}
$siteinfo['image'] = $meta_tag['content'];
break;
case 'twitter:card':
- // Convert Twitter types in our own
+ // Detect photo pages
if ($meta_tag['content'] == 'summary_large_image') {
$siteinfo['type'] = 'photo';
- } else {
- $siteinfo['type'] = $meta_tag['content'];
}
break;
case 'twitter:description':
}
}
- if ((@$siteinfo['image'] == '') && !$no_guessing) {
+ // Prevent to have a photo type without an image
+ if ((empty($siteinfo['image']) || !empty($siteinfo['text'])) && ($siteinfo['type'] == 'photo')) {
+ $siteinfo['type'] = 'link';
+ }
+
+ if (empty($siteinfo['image']) && !$no_guessing) {
$list = $xpath->query('//img[@src]');
foreach ($list as $node) {
$img_tag = [];
$complete = $schemearr["scheme"]."://".$schemearr["host"];
- if (@$schemearr["port"] != "") {
+ if (!empty($schemearr["port"])) {
$complete .= ":".$schemearr["port"];
}
- if (strpos($urlarr["path"], "/") !== 0) {
- $complete .= "/";
- }
+ if (!empty($urlarr["path"])) {
+ if (strpos($urlarr["path"], "/") !== 0) {
+ $complete .= "/";
+ }
- $complete .= $urlarr["path"];
+ $complete .= $urlarr["path"];
+ }
- if (@$urlarr["query"] != "") {
+ if (!empty($urlarr["query"])) {
$complete .= "?".$urlarr["query"];
}
- if (@$urlarr["fragment"] != "") {
+ if (!empty($urlarr["fragment"])) {
$complete .= "#".$urlarr["fragment"];
}