From 1fbf4394c8141960e7cbed1d32aa72b1f60d0484 Mon Sep 17 00:00:00 2001
From: valadaptive <valadaptive@protonmail.com>
Date: Sun, 10 Dec 2023 20:16:07 -0500
Subject: [PATCH] Separate Kobold Horde status function

---
 public/script.js | 27 ++++++++++++---------------
 server.js        | 30 ++++++++++++++----------------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/public/script.js b/public/script.js
index 237cd258f..3a8841aa2 100644
--- a/public/script.js
+++ b/public/script.js
@@ -868,21 +868,19 @@ export async function clearItemizedPrompts() {
     }
 }
 
-async function getStatusKobold() {
-    if (main_api == 'koboldhorde') {
-        try {
-            const hordeStatus = await checkHordeStatus();
-            online_status = hordeStatus ? 'Connected' : 'no_connection';
-        }
-        catch {
-            online_status = 'no_connection';
-        }
-
-        return resultCheckStatus();
+async function getStatusHorde() {
+    try {
+        const hordeStatus = await checkHordeStatus();
+        online_status = hordeStatus ? 'Connected' : 'no_connection';
+    }
+    catch {
+        online_status = 'no_connection';
     }
 
-    const url = '/getstatus';
+    return resultCheckStatus();
+}
 
+async function getStatusKobold() {
     let endpoint = api_server;
 
     if (!endpoint) {
@@ -891,7 +889,7 @@ async function getStatusKobold() {
     }
 
     try {
-        const response = await fetch(url, {
+        const response = await fetch('/getstatus', {
             method: 'POST',
             headers: getRequestHeaders(),
             body: JSON.stringify({
@@ -903,7 +901,6 @@ async function getStatusKobold() {
 
         const data = await response.json();
 
-
         online_status = data?.result;
 
         if (!online_status) {
@@ -5378,7 +5375,7 @@ function changeMainAPI() {
     }
 
     if (main_api == 'koboldhorde') {
-        getStatusKobold();
+        getStatusHorde();
         getHordeModels();
     }
 
diff --git a/server.js b/server.js
index a2ca26d6c..adceb3f7e 100644
--- a/server.js
+++ b/server.js
@@ -661,22 +661,20 @@ app.post('/getstatus', jsonParser, async function (request, response) {
     let version = '';
     let koboldVersion = {};
 
-    if (request.body.main_api == 'kobold') {
-        try {
-            version = (await fetchJSON(api_server + '/v1/info/version')).result;
-        }
-        catch {
-            version = '0.0.0';
-        }
-        try {
-            koboldVersion = (await fetchJSON(api_server + '/extra/version'));
-        }
-        catch {
-            koboldVersion = {
-                result: 'Kobold',
-                version: '0.0',
-            };
-        }
+    try {
+        version = (await fetchJSON(api_server + '/v1/info/version')).result;
+    }
+    catch {
+        version = '0.0.0';
+    }
+    try {
+        koboldVersion = (await fetchJSON(api_server + '/extra/version'));
+    }
+    catch {
+        koboldVersion = {
+            result: 'Kobold',
+            version: '0.0',
+        };
     }
 
     try {