From 7987f02deed19d15beb411bd6290037edfdaaf6b Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 4 Apr 2025 13:53:56 +0000
Subject: [PATCH] Exclude <style> tags from quote and underscore italics
 processing Fixes #3808

---
 public/script.js                      | 2 +-
 public/scripts/chats.js               | 2 +-
 public/scripts/showdown-underscore.js | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/script.js b/public/script.js
index a965502a7..1566a83cb 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2133,7 +2133,7 @@ export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, san
         }
 
         mes = mes.replace(
-            /```[\s\S]*?```|~~~[\s\S]*?~~~|``[\s\S]*?``|`[\s\S]*?`|(".*?")|(\u201C.*?\u201D)|(\u00AB.*?\u00BB)|(\u300C.*?\u300D)|(\u300E.*?\u300F)|(\uFF02.*?\uFF02)/gm,
+            /<style>[\s\S]*?<\/style>|```[\s\S]*?```|~~~[\s\S]*?~~~|``[\s\S]*?``|`[\s\S]*?`|(".*?")|(\u201C.*?\u201D)|(\u00AB.*?\u00BB)|(\u300C.*?\u300D)|(\u300E.*?\u300F)|(\uFF02.*?\uFF02)/gim,
             function (match, p1, p2, p3, p4, p5, p6) {
                 if (p1) {
                     // English double quotes
diff --git a/public/scripts/chats.js b/public/scripts/chats.js
index a264ee689..3c5795709 100644
--- a/public/scripts/chats.js
+++ b/public/scripts/chats.js
@@ -459,7 +459,7 @@ export async function appendFileContent(message, messageText) {
  * @copyright https://github.com/kwaroran/risuAI
  */
 export function encodeStyleTags(text) {
-    const styleRegex = /<style>(.+?)<\/style>/gms;
+    const styleRegex = /<style>(.+?)<\/style>/gims;
     return text.replaceAll(styleRegex, (_, match) => {
         return `<custom-style>${escape(match)}</custom-style>`;
     });
diff --git a/public/scripts/showdown-underscore.js b/public/scripts/showdown-underscore.js
index 2c1812fc0..34c763c01 100644
--- a/public/scripts/showdown-underscore.js
+++ b/public/scripts/showdown-underscore.js
@@ -8,10 +8,10 @@ export const markdownUnderscoreExt = () => {
 
         return [{
             type: 'output',
-            regex: new RegExp('(<code(?:\\s+[^>]*)?>[\\s\\S]*?<\\/code>)|\\b(?<!_)_(?!_)(.*?)(?<!_)_(?!_)\\b', 'g'),
-            replace: function(match, codeContent, italicContent) {
-                if (codeContent) {
-                    // If it's inside <code> tags, return unchanged
+            regex: new RegExp('(<code(?:\\s+[^>]*)?>[\\s\\S]*?<\\/code>|<style(?:\\s+[^>]*)?>[\\s\\S]*?<\\/style>)|\\b(?<!_)_(?!_)(.*?)(?<!_)_(?!_)\\b', 'gi'),
+            replace: function(match, tagContent, italicContent) {
+                if (tagContent) {
+                    // If it's inside <code> or <style> tags, return unchanged
                     return match;
                 } else if (italicContent) {
                     // If it's an italic group, apply the replacement