Issue 10019: Fix embedding of media objects

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 99737058550e445e9e1787c672ce594a6d8f051c..0b49e75a0e25e151348a13f497ee5a25c0e7df45 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -2257,10 +2257,10 @@ class BBCode
                        return $result;
                }
 
-               $siteinfo = ParseUrl::getSiteinfoCached($url);
+               $type = ParseUrl::getContentType($url);
 
-               if (in_array($siteinfo['type'], ['image', 'video', 'audio'])) {
-                       switch ($siteinfo['type']) {
+               if (in_array($type, ['image', 'video', 'audio'])) {
+                       switch ($type) {
                                case 'video':
                                        $bbcode = "\n" . '[video]' . $url . '[/video]' . "\n";
                                        break;
@@ -2275,6 +2275,8 @@ class BBCode
                        return $bbcode;
                }
 
+               $siteinfo = ParseUrl::getSiteinfoCached($url);
+
                unset($siteinfo['keywords']);
 
                // Bypass attachment if parse url for a comment

diff --git a/src/Module/ParseUrl.php b/src/Module/ParseUrl.php
index 8e72c4fa78160762408a3885bbc101f617007abe..7138238d85965b9815196c0e5ae8aee86f8d9029 100644 (file)
--- a/src/Module/ParseUrl.php
+++ b/src/Module/ParseUrl.php
@@ -94,11 +94,10 @@ class ParseUrl extends BaseModule
                }
 
                if ($format == 'json') {
-                       $siteinfo = Util\ParseUrl::getSiteinfoCached($url);
+                       $type = Util\ParseUrl::getContentType($url);
 
-                       if (empty($siteinfo['title']) && empty($siteinfo['text']) && empty($siteinfo['image'])
-                               && in_array($siteinfo['type'], ['image', 'video', 'audio'])) {
-                               switch ($siteinfo['type']) {
+                       if (in_array($type, ['image', 'video', 'audio'])) {
+                               switch ($type) {
                                        case 'video':
                                                $content_type = 'video';
                                                break;
@@ -114,6 +113,8 @@ class ParseUrl extends BaseModule
                                $ret['data'] = ['url' => $url];
                                $ret['success'] = true;
                        } else {
+                               $siteinfo = Util\ParseUrl::getSiteinfoCached($url);
+
                                unset($siteinfo['keywords']);
 
                                $ret['data'] = $siteinfo;

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index de280bcf85a623870d27952d1049208f52454d01..a634545cd7050685fe2aea1cf9f6695d39831827 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -51,6 +51,30 @@ class ParseUrl
         */
        const MIN_DESC_COUNT = 100;
 
+       /**
+        * Fetch the content type of the given url
+        * @param string $url URL of the page
+        * @return string content type 
+        */
+       public static function getContentType(string $url)
+       {
+               $curlResult = DI::httpRequest()->head($url);
+               if (!$curlResult->isSuccess()) {
+                       return '';
+               }
+
+               $contenttype =  $curlResult->getHeader('Content-Type');
+               if (empty($contenttype)) {
+                       return '';
+               }
+               
+               if (!preg_match('#(image|video|audio)/#i', $contenttype, $matches)) {
+                       return '';
+               }
+
+               return array_pop($matches);
+       }
+
        /**
         * Search for chached embeddable data of an url otherwise fetch it
         *