Fix code standards

[friendica.git] / src / Content / Text / Markdown.php

diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index cfd83a38d8e261d3aff18aabb8a8a2bcd4211061..33e023bc03662b9f55bbec4913a12b6506d6463a 100644 (file)
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,6 +21,7 @@
 
 namespace Friendica\Content\Text;
 
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -40,7 +41,7 @@ class Markdown
         * @return string
         */
        public static function convert($text, $hardwrap = true, $baseuri = null) {
-               $stamp1 = microtime(true);
+               DI::profiler()->startRecording('rendering');
 
                $MarkdownParser = new MarkdownParser();
                $MarkdownParser->code_class_prefix  = 'language-';
@@ -57,7 +58,7 @@ class Markdown
 
                $html = $MarkdownParser->transform($text);
 
-               DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack());
+               DI::profiler()->stopRecording();
 
                return $html;
        }
@@ -83,7 +84,7 @@ class Markdown
                                        return '';
                                }
 
-                               $data = Contact::getDetailsByAddr($matches[3]);
+                               $data = Contact::getByURL($matches[3]);
 
                                if (empty($data)) {
                                        return '';
@@ -107,8 +108,20 @@ class Markdown
         * So we'll use that to convert to HTML, then convert the HTML back to bbcode,
         * and then clean up a few Diaspora specific constructs.
         */
-       public static function toBBCode($s)
+       public static function toBBCode($s): string
        {
+               // @TODO Temporary until we find the source of the null value to finally set the correct type-hint
+               if (is_null($s)) {
+                       Logger::warning('Received null value', ['callstack' => System::callstack()]);
+                       return '';
+               }
+
+               if (!$s) {
+                       return $s;
+               }
+
+               DI::profiler()->startRecording('rendering');
+
                // The parser cannot handle paragraphs correctly
                $s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);
 
@@ -125,15 +138,14 @@ class Markdown
                //$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3$4]$2$3$4[/url]',$s);
                $s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism', '[youtube]$2[/youtube]', 'url', $s);
                $s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism'   , '[youtube]$1[/youtube]', 'url', $s);
+               $s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/www.youtube.com\/shorts\/(.*?)\].*?\[\/url\]/ism'     , '[youtube]$1[/youtube]', 'url', $s);
                $s = BBCode::pregReplaceInTag('/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism'        , '[vimeo]$2[/vimeo]'    , 'url', $s);
                $s = BBCode::pregReplaceInTag('/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism'              , '[vimeo]$1[/vimeo]'    , 'url', $s);
 
                // remove duplicate adjacent code tags
                $s = preg_replace('/(\[code\])+(.*?)(\[\/code\])+/ism', '[code]$2[/code]', $s);
 
-               // Don't show link to full picture (until it is fixed)
-               $s = BBCode::scaleExternalImages($s);
-
+               DI::profiler()->stopRecording();
                return $s;
        }
 }