From b996712ef72e106c6735b8720c52bb3f2cc87dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Wed, 22 Jun 2022 17:18:39 +0200 Subject: [PATCH] Images::getInfoFromURL[Cached]() will both return empty arrays on error and that needs to be reflected here, too. --- src/Content/Text/BBCode.php | 4 ++-- src/Protocol/OStatus.php | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index b4b8e48193..1c6f11c2f3 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -111,7 +111,7 @@ class BBCode $picturedata = Images::getInfoFromURLCached($matches[1]); - if ($picturedata) { + if (!empty($picturedata)) { if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) { $post['image'] = $matches[1]; } else { @@ -320,7 +320,7 @@ class BBCode $post['text'] = trim(str_replace($pictures[0][0], '', $body)); } else { $imgdata = Images::getInfoFromURLCached($pictures[0][1]); - if ($imgdata && substr($imgdata['mime'], 0, 6) == 'image/') { + if (!empty($imgdata) && substr($imgdata['mime'], 0, 6) == 'image/') { $post['type'] = 'photo'; $post['image'] = $pictures[0][1]; $post['preview'] = $pictures[0][2]; diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index d410fa4f71..be86c13be7 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1377,7 +1377,7 @@ class OStatus case 'photo': if (!empty($siteinfo['image'])) { $imgdata = Images::getInfoFromURLCached($siteinfo['image']); - if ($imgdata) { + if (!empty($imgdata)) { $attributes = [ 'rel' => 'enclosure', 'href' => $siteinfo['image'], @@ -1388,6 +1388,7 @@ class OStatus } } break; + case 'video': $attributes = [ 'rel' => 'enclosure', @@ -1398,13 +1399,15 @@ class OStatus ]; XML::addElement($doc, $root, 'link', '', $attributes); break; + default: + Logger::warning('Unsupported type', ['type' => $siteinfo['type'], 'url' => $siteinfo['url']]); break; } if (!DI::config()->get('system', 'ostatus_not_attach_preview') && ($siteinfo['type'] != 'photo') && isset($siteinfo['image'])) { $imgdata = Images::getInfoFromURLCached($siteinfo['image']); - if ($imgdata) { + if (!empty($imgdata)) { $attributes = [ 'rel' => 'enclosure', 'href' => $siteinfo['image'],