From 4ddeeab3cc8a9b438ff9e2e40f710cde713b18c1 Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Tue, 21 Mar 2023 18:15:02 +0900
Subject: [PATCH 1/4] fixed Novel API key not being displayed (also confirmed
 NAI works)

---
 public/index.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/public/index.html b/public/index.html
index 50e1db2a6..7b318e758 100644
--- a/public/index.html
+++ b/public/index.html
@@ -116,6 +116,18 @@
                     </div>
                 </div>
                 <div id="novel_api" style="display: none;position: relative;"> <!-- shows the novel settings -->
+                    <form action="javascript:void(null);" method="post" enctype="multipart/form-data">
+
+                        <h4>API key</h4>
+                        <h5>Where to get (<a href="/notes/6" target="_blank">?</a>)</h5>
+                        <input id="api_key_novel" name="api_key_novel" class="text_pole" maxlength="500" size="35" value="" autocomplete="off">
+                        <input id="api_button_novel" type="submit" value="Connect">
+                        <img id="api_loading_novel" src="img/load.svg">
+                    </form>
+                    <div id="online_status3">
+                        <div id="online_status_indicator3"></div>
+                        <div id="online_status_text3">No connection...</div>
+                    </div>
                     <h4>Novel AI Model
                         <a href="/notes/8" class="notes-link" target="_blank">
                             <span class="note-link-span">?</span>

From 5f32055a6402a1fd86169e5a60cd408c880b32bc Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Tue, 21 Mar 2023 18:29:38 +0900
Subject: [PATCH 2/4] updated AutoConnect to work with NAI and OobaWebUI

---
 public/scripts/RossAscends-mods.js | 9 +++++++--
 public/style.css                   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index 85f794410..38381205d 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -196,12 +196,18 @@ function RA_checkOnlineStatus() {
 //Auto-connect to API (when set to kobold, API URL exists, and auto_connect is true)
 
 function RA_autoconnect() {
+	console.log(main_api);
 	if (typeof online_status !== 'undefined' && (api_server !== '' || api_key_novel !== '')) {
 		if (online_status === "no_connection" && LoadLocalBool('AutoConnectEnabled')) {
 			if (isUrlOrAPIKey(api_server) && main_api === "kobold") {
-				$("#api_url_text").val(api_server);
 				$("#api_button").click();
 			}
+			if (main_api === "novel") {
+				$("#api_button_novel").click();
+			}
+			if (isUrlOrAPIKey(api_server) && main_api === "textgenerationwebui") {
+				$("#api_button_textgenerationwebui").click();
+			}
 		}
 	} else {
 		setTimeout(RA_autoconnect, 100);
@@ -209,7 +215,6 @@ function RA_autoconnect() {
 }
 
 function isUrlOrAPIKey(string) {
-	//const pattern = /^\d{3}-\d{3}-\d{3}-\d{3}$/; //need a sample novelAI key to set this format
 	try {
 		new URL(string);
 		return true;
diff --git a/public/style.css b/public/style.css
index dcc77526e..1004a0c6a 100644
--- a/public/style.css
+++ b/public/style.css
@@ -224,6 +224,7 @@ margin-top:5px;
     white-space: nowrap;
     width: 100%;
     margin: 1px auto 10px auto;
+    z-index: 3;
 }
 
 #send_form {

From 1adea9305ee41d1fb8f4fbeb328d4264a650fcb7 Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Tue, 21 Mar 2023 19:03:24 +0900
Subject: [PATCH 3/4] keyboard hotkey Ctrl+Up now works with novel and ooba

---
 public/scripts/RossAscends-mods.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index 38381205d..4991ad88a 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -312,8 +312,17 @@ $("document").ready(function () {
 		}
 		if (event.ctrlKey && event.key == "ArrowUp") {
 			//Ctrl+UpArrow for Connect to last server
+			console.log(main_api);
 			if (online_status === "no_connection") {
-				document.getElementById("api_button").click();
+				if (main_api == "kobold") {
+					document.getElementById("api_button").click();
+				}
+				if (main_api == "novel") {
+					document.getElementById("api_button_novel").click();
+				}
+				if (main_api == "textgenerationwebui") {
+					document.getElementById("api_button_textgenerationwebui").click();
+				}
 			}
 		}
 		if (event.ctrlKey && event.key == "ArrowLeft") {		//for debug, show all local stored vars

From 2b1cadc7cb421441e5331f170dcaeae5eab5ee9b Mon Sep 17 00:00:00 2001
From: RossAsscends <124905043+RossAscends@users.noreply.github.com>
Date: Tue, 21 Mar 2023 19:46:25 +0900
Subject: [PATCH 4/4] fix for template avatarImg, replaced with empty src

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 7b318e758..6160882b7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -995,7 +995,7 @@
     <div id="message_template">
         <div class="mes" mesid="${count_view_mes}" ch_name="${characterName}" is_user="${mes.is_user}">
             <div class="for_checkbox"></div><input type="checkbox" class="del_checkbox">
-            <div class="avatar"><img src="${avatarImg}"></div>
+            <div class="avatar"><img src=""></div>
             <div class="swipe_left"><img src="img/swipe_left.png"></div>
             <div class="mes_block">
                 <div class="ch_name">