Replace Diaspora mentions before the parsing to HTML in Text\Markdown

diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index bcbf5191a2b6ff22a5679446cf153fdea8637164..8dfe00190a85ed2c6e4f1f4b7177910a420f1bda 100644 (file)
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -53,6 +53,8 @@ class Markdown
                        return  $url;
                };
 
+               $text = self::convertDiasporaMentionsToHtml($text);
+
                $html = $MarkdownParser->transform($text);
 
                DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack());
@@ -61,35 +63,42 @@ class Markdown
        }
 
        /**
-        * 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::getDetailsByAddr($matches[3]);
+
+                               if (empty($data)) {
+                                       return '';
+                               }
+
+                               $name = $matches[2];
+
+                               if ($name == '') {
+                                       $name = $data['name'];
+                               }
+
+                               return $matches[1] . '<a href="' . $data['url'] . '">' . $name . '</a>';
+                       },
+                       $text
+               );
        }
 
        /*
@@ -110,9 +119,6 @@ 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