From 738c1d82c4e27fdeb57d7cce2864caa9aab0bf34 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 8 Nov 2023 17:54:08 +0200
Subject: [PATCH] Clarify legacy API notification

---
 public/index.html                  | 8 ++++----
 public/scripts/textgen-settings.js | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7f2e911dc..f6713dd18 100644
--- a/public/index.html
+++ b/public/index.html
@@ -269,9 +269,9 @@
                         </div>
 
                         <div id="respective-ranges-and-temps" class="width100p">
-                            <!-- 
+                            <!--
                         <div name="OldKoboldTempAndRepPenBlock" class="flex-container gap10h5v justifyCenter" id="range_block">
-                        </div> 
+                        </div>
                         -->
                             <div id="range_block_novel">
                                 <div class="range-block">
@@ -1714,7 +1714,7 @@
                             </div>
                             <label class="checkbox_label margin-bot-10px" for="legacy_api_textgenerationwebui">
                                 <input type="checkbox" id="legacy_api_textgenerationwebui" />
-                                <span data-i18n="Use Legacy API schema (pre-OAI)">Use Legacy API schema (pre-OAI, no streaming)</span>
+                                <span data-i18n="Legacy API (pre-OAI, no streaming)">Legacy API (pre-OAI, no streaming)</span>
                             </label>
                         </form>
                         <div class="online_status">
@@ -4957,4 +4957,4 @@
     </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index b6c2a0021..dbcebdb34 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -151,7 +151,8 @@ function formatTextGenURL(value) {
     try {
         const url = new URL(value);
         if (url.pathname === '/api' && !textgenerationwebui_settings.legacy_api) {
-            toastr.info(`Enable compatibility mode or update ooba-webui to the latest version.`, 'Legacy API URL detected. Generation may fail.', { preventDuplicates: true });
+            toastr.info(`Enable Legacy API or start Ooba with the OpenAI extension enabled.`, 'Legacy API URL detected. Generation may fail.', { preventDuplicates: true, timeOut: 10000, extendedTimeOut: 20000 });
+            url.pathname = '';
         }
 
         if (!power_user.relaxed_api_urls && textgenerationwebui_settings.legacy_api && !isMancer()) {