keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Picture posts do work again - everything else should work as well

Browse source
This commit is contained in:
Michael 2018-09-06 20:30:16 +00:00
parent 04fb885857
commit 1d4a5402ff
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Content/Text/BBCode.php
View file

@ -572,17 +572,17 @@ class BBCode extends BaseObject
$return = sprintf('<div class="type-%s">', $data["type"]); $return = sprintf('<div class="type-%s">', $data["type"]);
} }
if (!empty($data["image"])) { if (!empty($data['title']) && !empty($data['url'])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]); if (!empty($data["image"]) && empty($data["text"]) && ($data["type"] == "photo")) {
} elseif (!empty($data["preview"])) { $return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]); } else {
} if (!empty($data["image"])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
// Show a picture only when the BBCode is meant for posts to connector networks } elseif (!empty($data["preview"])) {
if (($simplehtml != 0) && ($data["type"] == "photo") && !empty($data["url"]) && !empty($data["image"])) { $return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]); }
} elseif (!empty($data['title']) && !empty($data['url'])) { $return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']); }
} }
if (!empty($data["description"]) && $data["description"] != $data["title"]) { if (!empty($data["description"]) && $data["description"] != $data["title"]) {

9
src/Util/ParseUrl.php
View file

@ -271,11 +271,9 @@ class ParseUrl
$siteinfo['image'] = $meta_tag['content']; $siteinfo['image'] = $meta_tag['content'];
break; break;
case 'twitter:card': case 'twitter:card':
// Convert Twitter types in our own // Detect photo pages
if ($meta_tag['content'] == 'summary_large_image') { if ($meta_tag['content'] == 'summary_large_image') {
$siteinfo['type'] = 'photo'; $siteinfo['type'] = 'photo';
} else {
$siteinfo['type'] = $meta_tag['content'];
} }
break; break;
case 'twitter:description': case 'twitter:description':
@ -334,6 +332,11 @@ class ParseUrl
} }
} }
// Prevent to have a photo type without an image
if (empty($siteinfo['image']) && (siteinfo['type'] == 'photo')) {
$siteinfo['type'] = 'link';
}
if ((@$siteinfo['image'] == '') && !$no_guessing) { if ((@$siteinfo['image'] == '') && !$no_guessing) {
$list = $xpath->query('//img[@src]'); $list = $xpath->query('//img[@src]');
foreach ($list as $node) { foreach ($list as $node) {