From 2fc6813e66d18789c4f708857542fe8976bf0cab Mon Sep 17 00:00:00 2001
From: 50h100a <all_awful@proton.me>
Date: Thu, 3 Aug 2023 06:07:54 -0400
Subject: [PATCH] code review adjustments part 1

---
 public/index.html                  |  4 ++--
 public/script.js                   | 11 ++++++-----
 public/scripts/textgen-settings.js | 11 +++++++++++
 public/style.css                   |  4 ++++
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/public/index.html b/public/index.html
index 459a884cf..7d02740ad 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1541,7 +1541,7 @@
                     <div id="textgenerationwebui_api" style="display: none;position: relative;">
                         <form action="javascript:void(null);" method="post" enctype="multipart/form-data">
                             If you are using: 
-                            <div class="flex-container" style="margin-left:20px;">
+                            <div class="flex-container indent20p">
                                 <a href="https://github.com/oobabooga/text-generation-webui" target="_blank">
                                     oobabooga/text-generation-webui
                                 </a>, 
@@ -1549,7 +1549,7 @@
                                     Make sure you run it with <tt>--api</tt> flag
                                 </span>
                             </div>
-                            <div class="flex-container" style="margin-left:20px;">
+                            <div class="flex-container indent20p">
                                 <a href="https://mancer.tech/" target="_blank">
                                     Mancer AI
                                 </a>, 
diff --git a/public/script.js b/public/script.js
index f067f7474..1be052902 100644
--- a/public/script.js
+++ b/public/script.js
@@ -17,6 +17,7 @@ import {
     loadTextGenSettings,
     generateTextGenWithStreaming,
     getTextGenGenerationData,
+    formatTextGenURL,
 } from "./scripts/textgen-settings.js";
 
 import {
@@ -7687,24 +7688,24 @@ $(document).ready(function () {
 
     $("#use-mancer-api-checkbox").on("change", function (e) {
         const enabled = $("#use-mancer-api-checkbox").prop("checked");
-        $("#mancer-api-ui").css("display", enabled?"block":"none");
+        $("#mancer-api-ui").toggle(enabled);
         api_use_mancer_webui = enabled;
         saveSettingsDebounced(); 
         getStatus();
     });
 
-    $("#api_button_textgenerationwebui").click(function (e) {
+    $("#api_button_textgenerationwebui").click(async function (e) {
         e.stopPropagation();
         if ($("#textgenerationwebui_api_url_text").val() != "") {
-            let value = $("#textgenerationwebui_api_url_text").val().trim();
-            if (!value || !value.endsWith('/api')) {
+            let value = formatTextGenURL($("#textgenerationwebui_api_url_text").val().trim())
+            if (!value) {
                 callPopup('Please enter a valid URL.<br/>WebUI URLs should end with <tt>/api</tt>', 'text');
                 return;
             }
 
             const mancer_key = $("#api_key_mancer").val().trim();
             if (mancer_key.length) {
-                writeSecret(SECRET_KEYS.MANCER, mancer_key);
+                await writeSecret(SECRET_KEYS.MANCER, mancer_key);
             }
 
             $("#textgenerationwebui_api_url_text").val(value);
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 7bdab35e4..cc984e361 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -10,6 +10,7 @@ export {
     textgenerationwebui_settings,
     loadTextGenSettings,
     generateTextGenWithStreaming,
+    formatTextGenURL,
 }
 
 const textgenerationwebui_settings = {
@@ -94,6 +95,16 @@ function selectPreset(name) {
     saveSettingsDebounced();
 }
 
+function formatTextGenURL(value) {
+    try {
+        const url = new URL(value);
+        if (url.pathname.endsWith('/api')) {
+            return url.toString();
+        }
+    } catch { } // Try and Catch both fall through to the same return.
+    return null;
+}
+
 function convertPresets(presets) {
     return Array.isArray(presets) ? presets.map(JSON.parse) : [];
 }
diff --git a/public/style.css b/public/style.css
index fda0ee5e3..96233f3d1 100644
--- a/public/style.css
+++ b/public/style.css
@@ -4409,6 +4409,10 @@ toolcool-color-picker {
     width: 50px;
 }
 
+.indent20p {
+    margin-left: 20px;
+}
+
 .wi-enter-footer-text {
     font-size: calc(var(--mainFontSize) * 0.8);
     color: var(--SmartThemeBodyColor);