Support for stacked profiler analysis

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

diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index bcbf5191a2b6ff22a5679446cf153fdea8637164..905860647f0f83a9bb17c13f2e3d2b6a1338c29e 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-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,6 @@
 
 namespace Friendica\Content\Text;
 
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Contact;
 
@@ -35,61 +34,70 @@ class Markdown
         * compatibility with Diaspora in spite of the Markdown standard.
         *
         * @param string $text
-        * @param bool   $hardwrap
+        * @param bool   $hardwrap Enables line breaks on \n without two trailing spaces
+        * @param string $baseuri  Optional. Prepend anchor links with this URL
         * @return string
-        * @throws \Exception
         */
-       public static function convert($text, $hardwrap = true) {
-               $stamp1 = microtime(true);
+       public static function convert($text, $hardwrap = true, $baseuri = null) {
+               DI::profiler()->startRecording('rendering');
 
                $MarkdownParser = new MarkdownParser();
                $MarkdownParser->code_class_prefix  = 'language-';
                $MarkdownParser->hard_wrap          = $hardwrap;
                $MarkdownParser->hashtag_protection = true;
-               $MarkdownParser->url_filter_func    = function ($url) {
-                       if (strpos($url, '#') === 0) {
-                               $url = ltrim($_SERVER['REQUEST_URI'], '/') . $url;
+               $MarkdownParser->url_filter_func    = function ($url) use ($baseuri) {
+                       if (!empty($baseuri) && strpos($url, '#') === 0) {
+                               $url = ltrim($baseuri, '/') . $url;
                        }
                        return  $url;
                };
 
+               $text = self::convertDiasporaMentionsToHtml($text);
+
                $html = $MarkdownParser->transform($text);
 
-               DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack());
+               DI::profiler()->stopRecording();
 
                return $html;
        }
 
        /**
-        * Callback function to replace a Diaspora style mention in a mention for Friendica
+        * Replace Diaspora-style mentions in a text since they trip the Markdown parser autolinker.
         *
-        * @param array $match Matching values for the callback
-        *                     [1] = mention type (@ or !)
-        *                     [2] = name (optional)
-        *                     [3] = address
-        * @return string Replaced mention
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        * @throws \ImagickException
+        * @param string $text
+        * @return string
         */
-       private static function diasporaMention2BBCodeCallback($match)
+       private static function convertDiasporaMentionsToHtml(string $text)
        {
-               if ($match[3] == '') {
-                       return;
-               }
-
-               $data = Contact::getDetailsByAddr($match[3]);
-
-               if (empty($data)) {
-                       return;
-               }
-
-               $name = $match[2];
-
-               if ($name == '') {
-                       $name = $data['name'];
-               }
-
-               return $match[1] . '[url=' . $data['url'] . ']' . $name . '[/url]';
+               return preg_replace_callback(
+                       '/([@!]){(?:([^}]+?); ?)?([^} ]+)}/',
+                       /*
+                        * Matching values for the callback
+                        * [1] = mention type (@ or !)
+                        * [2] = name (optional)
+                        * [3] = profile URL
+                        */
+                       function ($matches) {
+                               if ($matches[3] == '') {
+                                       return '';
+                               }
+
+                               $data = Contact::getByURL($matches[3]);
+
+                               if (empty($data)) {
+                                       return '';
+                               }
+
+                               $name = $matches[2];
+
+                               if ($name == '') {
+                                       $name = $data['name'];
+                               }
+
+                               return $matches[1] . '<a href="' . $data['url'] . '">' . $name . '</a>';
+                       },
+                       $text
+               );
        }
 
        /*
@@ -100,7 +108,7 @@ class Markdown
         */
        public static function toBBCode($s)
        {
-               $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
+               DI::profiler()->startRecording('rendering');
 
                // The parser cannot handle paragraphs correctly
                $s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);
@@ -110,17 +118,11 @@ class Markdown
 
                $s = self::convert($s);
 
-               $regexp = "/([@!])\{(?:([^\}]+?); ?)?([^\} ]+)\}/";
-               $s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
-
                $s = HTML::toBBCode($s);
 
                // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
                $s = str_replace('&#x2672;', html_entity_decode('&#x2672;', ENT_QUOTES, 'UTF-8'), $s);
 
-               // Convert everything that looks like a link to a link
-               $s = preg_replace('/([^\]=]|^)(https?\:\/\/)([a-zA-Z0-9:\/\-?&;.=_~#%$!+,@]+(?<!,))/ism', '$1[url=$2$3]$2$3[/url]', $s);
-
                //$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);
@@ -133,6 +135,7 @@ class Markdown
                // Don't show link to full picture (until it is fixed)
                $s = BBCode::scaleExternalImages($s);
 
+               DI::profiler()->stopRecording();
                return $s;
        }
 }