From d6e6f9520d8f6663d95e5cfd6afc7736320ef557 Mon Sep 17 00:00:00 2001
From: SillyLossy <titan0599@gmail.com>
Date: Wed, 15 Feb 2023 11:08:01 +0200
Subject: [PATCH] Hide SPs select for now, refactor async endpoints

---
 public/index.html |  2 +-
 public/style.css  |  5 +++++
 server.js         | 45 ++++++---------------------------------------
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/public/index.html b/public/index.html
index be25bc5db..c05c4828c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3724,7 +3724,7 @@
                             <h4>Content</h4>
                             <h5>Text that will be inserted to the prompt upon activation.</h5>
                         </label>
-                        <textarea class="text_pole" name="content" rows="4" placeholder=""></textarea>
+                        <textarea class="text_pole" name="content" rows="2" placeholder=""></textarea>
                     </div>
                     <div class="world_entry_form_control world_entry_form_horizontal">
                         <label class="checkbox" for="constant">
diff --git a/public/style.css b/public/style.css
index cb4d264ef..4f70e1aef 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1152,6 +1152,11 @@ input[type=button] {
     margin-bottom: 10px;
 }
 
+/* hidden until we find out a way to handle it better */
+#softprompt_block {
+    display: none !important;
+}
+
 #world_info {
     margin-bottom: 12px;
 }
diff --git a/server.js b/server.js
index b6e37a339..f8988676f 100644
--- a/server.js
+++ b/server.js
@@ -367,7 +367,6 @@ const formatApiUrl = (url) => (url.indexOf('localhost') !== -1)
     ? url.replace('localhost', '127.0.0.1')
     : url;
 
-// TODO Rewrite using async wrapper from worldinfo branch
 app.post('/getsoftprompts', jsonParser, async function (request, response) {
     if (!request.body || !request.body.api_server) {
         return response.sendStatus(400);
@@ -377,34 +376,8 @@ app.post('/getsoftprompts', jsonParser, async function (request, response) {
     let soft_prompts = [];
 
     try {
-        var args = { headers: { "Content-Type": "application/json" } };
-        const softPromptsList = await new Promise((resolve, reject) => {
-            client.get(`${baseUrl}/v1/config/soft_prompts_list`, args, function (data, response) {
-                if (response.statusCode == 200) {
-                    const nameList = data.values.map(x => x.value);
-                    resolve(nameList);
-                }
-                else {
-                    reject(response.status);
-                }
-            }).on('error', function (err) {
-                reject(err);
-            });
-        });
-
-        const softPromptSelected = await new Promise((resolve, reject) => {
-            client.get(`${baseUrl}/v1/config/soft_prompt`, args, function (data, response) {
-                if (response.statusCode == 200) {
-                    resolve(data.value);
-                }
-                else {
-                    reject(response.status);
-                }
-            }).on('error', function (err) {
-                reject(err);
-            });
-        });
-
+        const softPromptsList = (await getAsync(`${baseUrl}/v1/config/soft_prompts_list`, baseRequestArgs)).values.map(x => x.value);
+        const softPromptSelected = (await getAsync(`${baseUrl}/v1/config/soft_prompt`, baseRequestArgs)).value;
         soft_prompts = softPromptsList.map(x => ({ name: x, selected: x === softPromptSelected }));
     } catch (err) {
         soft_prompts = [];
@@ -413,7 +386,6 @@ app.post('/getsoftprompts', jsonParser, async function (request, response) {
     return response.send({ soft_prompts });
 });
 
-// TODO Rewrite using async wrapper from worldinfo branch
 app.post("/setsoftprompt", jsonParser, async function(request, response) {
     if (!request.body || !request.body.api_server) {
         return response.sendStatus(400);
@@ -424,15 +396,10 @@ app.post("/setsoftprompt", jsonParser, async function(request, response) {
         headers: { "Content-Type": "application/json" },
         data: { value: request.body.name ?? '' },
     };
-    client.put(`${baseUrl}/v1/config/soft_prompt`, args, function (_, res) {
-        if (res.statusCode == 200) {
-            return response.sendStatus(200);
-        } else {
-            return response.sendStatus(500);
-        }
-    }).on('error', () => {
-        return response.sendStatus(500);
-    });
+
+    await putAsync(`${baseUrl}/v1/config/soft_prompt`, args);
+
+    return response.sendStatus(200);
 });
 
 function checkServer(){