From d6801975a0aee227c9e770c5ac566910371b914f Mon Sep 17 00:00:00 2001
From: Halsey1006 <dprimm1006@gmail.com>
Date: Mon, 24 Apr 2023 17:50:42 -0700
Subject: [PATCH 1/4] Rewrote quote recolor regex

Found some more issues with quote recoloring, particularly in relation to numbered lists.

Tested this change a bit more thoroughly, including multiple sets of backtick-enclosed quote marks on the same line, all seems to be working properly now.
---
 public/script.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/script.js b/public/script.js
index 3583db1c1..3da42b3fd 100644
--- a/public/script.js
+++ b/public/script.js
@@ -878,14 +878,17 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
             .replace(/\*\*(.+?)\*\*/g, "<b>$1</b>")
             .replace(/\n/g, "<br/>");
     } else if (!isSystem) {
+		mes = mes.replace(/```[\s\S]*?```|``[\s\S]*?``|`[\s\S]*?`|(\".+?\")/gm, function(match, p1) {
+		  if (p1) {
+			return "<q>" + p1.replace(/\"/g, "") + "</q>";
+		  } else {
+			return match;
+		  }
+		});
         mes = converter.makeHtml(mes);
         //mes = mes.replace(/{.*}/g, "");
         mes = mes.replace(/{{(\*?.+?\*?)}}/g, "");
 
-
-        mes = mes.replace(/(<code[^>]*>[\s\S]*?<\/code>)|\"(.+?)\"/g, function (match, code, quote) {
-            return code ? code : `<q>${quote}</q>`;
-        });
         mes = mes.replace(/\n/g, "<br/>");
         mes = mes.trim();
 

From 9048efdc8b2bd1854ef9f3898f4644a4ffe76f63 Mon Sep 17 00:00:00 2001
From: Halsey1006 <dprimm1006@gmail.com>
Date: Mon, 24 Apr 2023 19:13:42 -0700
Subject: [PATCH 2/4] Added "Send on Enter" power user setting

Defaults to on. Intended for use on mobile, so line breaks can be more easily added while typing.
---
 public/index.html |  6 +++++-
 public/script.js  | 24 +++++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/public/index.html b/public/index.html
index 998100c74..ab6706e01 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1260,7 +1260,11 @@
                                 <input id="swipes-checkbox" type="checkbox" />
                                 Swipes
                             </label>
-                            <label for="play_message_sound" class="checkbox_label">
+                            <label for="sendOnEnter-checkbox">
+                                <input id="sendOnEnter-checkbox" type="checkbox" />
+                                Send on Enter
+                            </label>                            
+							<label for="play_message_sound" class="checkbox_label">
                                 <input id="play_message_sound" type="checkbox" />
                                 <audio id="audio_message_sound" src="sounds/message.mp3" hidden></audio>
                                 <span>
diff --git a/public/script.js b/public/script.js
index 3da42b3fd..a196e5ba9 100644
--- a/public/script.js
+++ b/public/script.js
@@ -405,6 +405,7 @@ var message_already_generated = "";
 var cycle_count_generation = 0;
 
 var swipes = false;
+var sendOnEnter = true;
 
 let anchor_order = 0;
 let style_anchor = true;
@@ -878,6 +879,7 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
             .replace(/\*\*(.+?)\*\*/g, "<b>$1</b>")
             .replace(/\n/g, "<br/>");
     } else if (!isSystem) {
+		
 		mes = mes.replace(/```[\s\S]*?```|``[\s\S]*?``|`[\s\S]*?`|(\".+?\")/gm, function(match, p1) {
 		  if (p1) {
 			return "<q>" + p1.replace(/\"/g, "") + "</q>";
@@ -885,16 +887,23 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
 			return match;
 		  }
 		});
+		
         mes = converter.makeHtml(mes);
+
         //mes = mes.replace(/{.*}/g, "");
         mes = mes.replace(/{{(\*?.+?\*?)}}/g, "");
 
+
+
         mes = mes.replace(/\n/g, "<br/>");
         mes = mes.trim();
 
         mes = mes.replace(/<code(.*)>[\s\S]*?<\/code>/g, function (match) {
             return match.replace(/&amp;/g, '&');
         });
+	//mes = mes.replace(/(?<!<code>)(\".+?\")(?![^<]*<\/code>)/g, "<q>$1</q>");
+
+	
     }
 
     if (forceAvatar) {
@@ -2800,7 +2809,9 @@ async function getSettings(type) {
 
                 swipes = !!settings.swipes;  //// swipecode
                 $('#swipes-checkbox').prop('checked', swipes); /// swipecode
-                //console.log('getSettings -- swipes = ' + swipes + '. toggling box');
+				sendOnEnter = !!settings.sendOnEnter;
+                $('#sendOnEnter-checkbox').prop('checked', sendOnEnter);
+				//console.log('getSettings -- swipes = ' + swipes + '. toggling box');
                 hideSwipeButtons();
                 //console.log('getsettings calling showswipebtns');
                 showSwipeButtons();
@@ -2915,7 +2926,8 @@ async function saveSettings(type) {
             active_character: active_character,
             textgenerationwebui_settings: textgenerationwebui_settings,
             swipes: swipes,
-            horde_settings: horde_settings,
+            sendOnEnter: sendOnEnter,
+			horde_settings: horde_settings,
             power_user: power_user,
             poe_settings: poe_settings,
             extension_settings: extension_settings,
@@ -3556,6 +3568,12 @@ $(document).ready(function () {
         saveSettingsDebounced();
     });
 
+    $('#sendOnEnter-checkbox').change(function () {
+        sendOnEnter = !!$('#sendOnEnter-checkbox').prop('checked');
+
+        saveSettingsDebounced();
+    });
+
     ///// SWIPE BUTTON CLICKS ///////
 
     $(document).on('click', '.swipe_right', function () {               //when we click swipe right button
@@ -3847,7 +3865,7 @@ $(document).ready(function () {
     });
 
     $("#send_textarea").keydown(function (e) {
-        if (!e.shiftKey && !e.ctrlKey && e.key == "Enter" && is_send_press == false) {
+        if (!e.shiftKey && !e.ctrlKey && e.key == "Enter" && is_send_press == false && !!$('#sendOnEnter-checkbox').prop('checked')) {
             is_send_press = true;
             e.preventDefault();
             Generate();

From cc4f3c4ef7be769c77d03ca0d634d2fcff0ccfda Mon Sep 17 00:00:00 2001
From: Halsey1006 <dprimm1006@gmail.com>
Date: Tue, 25 Apr 2023 02:50:53 -0700
Subject: [PATCH 3/4] Removed Send on Enter

---
 public/index.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/index.html b/public/index.html
index ab6706e01..998100c74 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1260,11 +1260,7 @@
                                 <input id="swipes-checkbox" type="checkbox" />
                                 Swipes
                             </label>
-                            <label for="sendOnEnter-checkbox">
-                                <input id="sendOnEnter-checkbox" type="checkbox" />
-                                Send on Enter
-                            </label>                            
-							<label for="play_message_sound" class="checkbox_label">
+                            <label for="play_message_sound" class="checkbox_label">
                                 <input id="play_message_sound" type="checkbox" />
                                 <audio id="audio_message_sound" src="sounds/message.mp3" hidden></audio>
                                 <span>

From 93758195ff9f77d246fe0f5151a89dd924a48581 Mon Sep 17 00:00:00 2001
From: Halsey1006 <dprimm1006@gmail.com>
Date: Tue, 25 Apr 2023 02:51:14 -0700
Subject: [PATCH 4/4] Removed Send on Enter

---
 public/script.js | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/public/script.js b/public/script.js
index a196e5ba9..3da42b3fd 100644
--- a/public/script.js
+++ b/public/script.js
@@ -405,7 +405,6 @@ var message_already_generated = "";
 var cycle_count_generation = 0;
 
 var swipes = false;
-var sendOnEnter = true;
 
 let anchor_order = 0;
 let style_anchor = true;
@@ -879,7 +878,6 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
             .replace(/\*\*(.+?)\*\*/g, "<b>$1</b>")
             .replace(/\n/g, "<br/>");
     } else if (!isSystem) {
-		
 		mes = mes.replace(/```[\s\S]*?```|``[\s\S]*?``|`[\s\S]*?`|(\".+?\")/gm, function(match, p1) {
 		  if (p1) {
 			return "<q>" + p1.replace(/\"/g, "") + "</q>";
@@ -887,23 +885,16 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
 			return match;
 		  }
 		});
-		
         mes = converter.makeHtml(mes);
-
         //mes = mes.replace(/{.*}/g, "");
         mes = mes.replace(/{{(\*?.+?\*?)}}/g, "");
 
-
-
         mes = mes.replace(/\n/g, "<br/>");
         mes = mes.trim();
 
         mes = mes.replace(/<code(.*)>[\s\S]*?<\/code>/g, function (match) {
             return match.replace(/&amp;/g, '&');
         });
-	//mes = mes.replace(/(?<!<code>)(\".+?\")(?![^<]*<\/code>)/g, "<q>$1</q>");
-
-	
     }
 
     if (forceAvatar) {
@@ -2809,9 +2800,7 @@ async function getSettings(type) {
 
                 swipes = !!settings.swipes;  //// swipecode
                 $('#swipes-checkbox').prop('checked', swipes); /// swipecode
-				sendOnEnter = !!settings.sendOnEnter;
-                $('#sendOnEnter-checkbox').prop('checked', sendOnEnter);
-				//console.log('getSettings -- swipes = ' + swipes + '. toggling box');
+                //console.log('getSettings -- swipes = ' + swipes + '. toggling box');
                 hideSwipeButtons();
                 //console.log('getsettings calling showswipebtns');
                 showSwipeButtons();
@@ -2926,8 +2915,7 @@ async function saveSettings(type) {
             active_character: active_character,
             textgenerationwebui_settings: textgenerationwebui_settings,
             swipes: swipes,
-            sendOnEnter: sendOnEnter,
-			horde_settings: horde_settings,
+            horde_settings: horde_settings,
             power_user: power_user,
             poe_settings: poe_settings,
             extension_settings: extension_settings,
@@ -3568,12 +3556,6 @@ $(document).ready(function () {
         saveSettingsDebounced();
     });
 
-    $('#sendOnEnter-checkbox').change(function () {
-        sendOnEnter = !!$('#sendOnEnter-checkbox').prop('checked');
-
-        saveSettingsDebounced();
-    });
-
     ///// SWIPE BUTTON CLICKS ///////
 
     $(document).on('click', '.swipe_right', function () {               //when we click swipe right button
@@ -3865,7 +3847,7 @@ $(document).ready(function () {
     });
 
     $("#send_textarea").keydown(function (e) {
-        if (!e.shiftKey && !e.ctrlKey && e.key == "Enter" && is_send_press == false && !!$('#sendOnEnter-checkbox').prop('checked')) {
+        if (!e.shiftKey && !e.ctrlKey && e.key == "Enter" && is_send_press == false) {
             is_send_press = true;
             e.preventDefault();
             Generate();