Continued:

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

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 36355f99645ff2936fb446733960571ba0ae3230..835a96e4d3b58c158b4fcaef3560f4edd6402af6 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -291,7 +291,7 @@ class BBCode
                // Remove all unneeded white space
                do {
                        $oldtext = $text;
-                       $text = str_replace(['  ', "\n", "\r", '"', '_'], ' ', $text);
+                       $text = str_replace(['  ', "\n", "\r", '"'], ' ', $text);
                } while ($oldtext != $text);
 
                return trim($text);
@@ -1234,7 +1234,7 @@ class BBCode
        }
 
        /**
-        * Expand Youtube and Vimeo links to 
+        * Expand Youtube and Vimeo links to
         *
         * @param string $text
         * @return string
@@ -1387,7 +1387,7 @@ class BBCode
                                        "\n[hr]", "[hr]\n", " [hr]", "[hr] ",
                                        "\n[attachment ", " [attachment ", "\n[/attachment]", "[/attachment]\n", " [/attachment]", "[/attachment] ",
                                        "[table]\n", "[table] ", " [table]", "\n[/table]", " [/table]", "[/table] ",
-                                       " \n", "\t\n", "[/li]\n", "\n[li]", "\n[*]", 
+                                       " \n", "\t\n", "[/li]\n", "\n[li]", "\n[*]",
                                ];
                                $replace = [
                                        "[th]", "[th]", "[th]", "[/th]", "[/th]", "[/th]",
@@ -1480,14 +1480,14 @@ class BBCode
                                if ($simple_html == self::INTERNAL) {
                                        //Ensure to always start with <h4> if possible
                                        $heading_count = 0;
-                                       for ($level = 6; $level > 0; $level--) { 
+                                       for ($level = 6; $level > 0; $level--) {
                                                if (preg_match("(\[h$level\].*?\[\/h$level\])ism", $text)) {
                                                        $heading_count++;
                                                }
                                        }
                                        if ($heading_count > 0) {
                                                $heading = min($heading_count + 3, 6);
-                                               for ($level = 6; $level > 0; $level--) { 
+                                               for ($level = 6; $level > 0; $level--) {
                                                        if (preg_match("(\[h$level\].*?\[\/h$level\])ism", $text)) {
                                                                $text = preg_replace("(\[h$level\](.*?)\[\/h$level\])ism", "</p><h$heading>$1</h$heading><p>", $text);
                                                                $heading--;
@@ -1548,7 +1548,11 @@ class BBCode
                                $text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism", '<span style="$1">$2</span>', $text);
 
                                // Mastodon Emoji (internal tag, do not document for users)
-                               $text = preg_replace("(\[emoji=(.*?)](.*?)\[/emoji])ism", '<span class="mastodon emoji"><img src="$1" alt="$2" title="$2"/></span>', $text);
+                               if ($simple_html == self::MASTODON_API) {
+                                       $text = preg_replace("(\[emoji=(.*?)](.*?)\[/emoji])ism", '$2', $text);
+                               } else {
+                                       $text = preg_replace("(\[emoji=(.*?)](.*?)\[/emoji])ism", '<span class="mastodon emoji"><img src="$1" alt="$2" title="$2"/></span>', $text);
+                               }
 
                                // Check for CSS classes
                                // @deprecated since 2021.12, left for backward-compatibility reasons
@@ -1791,12 +1795,8 @@ class BBCode
                                        $text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $text);
                                }
 
-                               if (!$for_plaintext && DI::config()->get('system', 'big_emojis') && ($simple_html != self::DIASPORA)) {
-                                       $conv = html_entity_decode(str_replace([' ', "\n", "\r"], '', $text));
-                                       // Emojis are always 4 byte Unicode characters
-                                       if (!empty($conv) && (strlen($conv) / mb_strlen($conv) == 4)) {
-                                               $text = '<span style="font-size: xx-large; line-height: normal;">' . $text . '</span>';
-                                       }
+                               if (!$for_plaintext && DI::config()->get('system', 'big_emojis') && ($simple_html != self::DIASPORA) && Smilies::isEmojiPost($text)) {
+                                       $text = '<span style="font-size: xx-large; line-height: normal;">' . $text . '</span>';
                                }
 
                                // Handle mentions and hashtag links
@@ -1958,7 +1958,7 @@ class BBCode
                                        $text
                                );
 
-                               // sanitize href attributes (only allowlisted protocols URLs)
+                               // sanitize href attributes (only whitelisted protocols URLs)
                                // default value for backward compatibility
                                $allowed_link_protocols = DI::config()->get('system', 'allowed_link_protocols', []);
 
@@ -2171,6 +2171,9 @@ class BBCode
                // Maybe we should make this newline at every time before a quote.
                $text = str_replace(['</a><blockquote>'], ['</a><br><blockquote>'], $text);
 
+               // The converter doesn't convert these elements
+               $text = str_replace(['<div>', '</div>'], ['<p>', '</p>'], $text);
+
                // Now convert HTML to Markdown
                $text = HTML::toMarkdown($text);