Integrate fetching of the content type into "getSiteinfo"

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 0b49e75..9973705 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -2257,10 +2257,10 @@ class BBCode
                        return $result;
                }
 
-               $type = ParseUrl::getContentType($url);
+               $siteinfo = ParseUrl::getSiteinfoCached($url);
 
-               if (in_array($type, ['image', 'video', 'audio'])) {
-                       switch ($type) {
+               if (in_array($siteinfo['type'], ['image', 'video', 'audio'])) {
+                       switch ($siteinfo['type']) {
                                case 'video':
                                        $bbcode = "\n" . '[video]' . $url . '[/video]' . "\n";
                                        break;
@@ -2275,8 +2275,6 @@ 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 7138238..ed48ea1 100644 (file)
--- a/src/Module/ParseUrl.php
+++ b/src/Module/ParseUrl.php
@@ -94,10 +94,10 @@ class ParseUrl extends BaseModule
                }
 
                if ($format == 'json') {
-                       $type = Util\ParseUrl::getContentType($url);
+                       $siteinfo = Util\ParseUrl::getSiteinfoCached($url);
 
-                       if (in_array($type, ['image', 'video', 'audio'])) {
-                               switch ($type) {
+                       if (in_array($siteinfo['type'], ['image', 'video', 'audio'])) {
+                               switch ($siteinfo['type']) {
                                        case 'video':
                                                $content_type = 'video';
                                                break;
@@ -113,8 +113,6 @@ 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 a634545..83d0d84 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -210,6 +210,12 @@ class ParseUrl
                        return $siteinfo;
                }
 
+               $type = self::getContentType($url);
+               if (in_array($type, ['image', 'video', 'audio'])) {
+                       $siteinfo['type'] = $type;
+                       return $siteinfo;
+               }
+
                $curlResult = DI::httpRequest()->get($url);
                if (!$curlResult->isSuccess()) {
                        return $siteinfo;
@@ -251,7 +257,7 @@ class ParseUrl
                        $oembed_data = OEmbed::fetchURL($url);
 
                        if (!empty($oembed_data->type)) {
-                               if (!in_array($oembed_data->type, ['error', 'rich', ''])) {
+                               if (!in_array($oembed_data->type, ['error', 'rich', 'image', 'video', 'audio', ''])) {
                                        $siteinfo['type'] = $oembed_data->type;
                                }