Remove event.adjust field

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

diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 71437fb350b33441812b643d01ace331579a8245..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,20 +34,20 @@ 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;
                };
@@ -57,7 +56,7 @@ class Markdown
 
                $html = $MarkdownParser->transform($text);
 
-               DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack());
+               DI::profiler()->stopRecording();
 
                return $html;
        }
@@ -83,7 +82,7 @@ class Markdown
                                        return '';
                                }
 
-                               $data = Contact::getDetailsByAddr($matches[3]);
+                               $data = Contact::getByURL($matches[3]);
 
                                if (empty($data)) {
                                        return '';
@@ -109,6 +108,8 @@ class Markdown
         */
        public static function toBBCode($s)
        {
+               DI::profiler()->startRecording('rendering');
+
                // The parser cannot handle paragraphs correctly
                $s = str_replace(['</p>', '<p>', '<p dir="ltr">'], ['<br>', '<br>', '<br>'], $s);
 
@@ -134,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;
        }
 }