From 3bebf92599fd8ac9f915d8e193b9a7a6b0545882 Mon Sep 17 00:00:00 2001
From: alterdekim <alterwain@protonmail.com>
Date: Wed, 13 Mar 2024 18:26:12 +0300
Subject: [PATCH] api fix

---
 .../controller/DatabaseController.java        |  2 +-
 .../static/javascript/panel-script.js         | 30 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java b/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java
index 1f33a38..ae499f2 100644
--- a/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java
+++ b/src/main/java/com/alterdekim/javabot/controller/DatabaseController.java
@@ -105,7 +105,7 @@ public class DatabaseController {
     }
 
     private void saveAction(Map<String, String> params) {
-        String scriptBody = new CrockfordBase32().decodeToString(params.get("action_body_text"));
+        String scriptBody = params.get("action_body_text");
         String name_text = new String(HashUtils.decodeHexString(params.get("action_name_text")));
         TextDataVal t1 = textDataValService.save(new TextDataVal(name_text));
 
diff --git a/src/main/resources/static/javascript/panel-script.js b/src/main/resources/static/javascript/panel-script.js
index 218d098..09ac034 100644
--- a/src/main/resources/static/javascript/panel-script.js
+++ b/src/main/resources/static/javascript/panel-script.js
@@ -9,25 +9,21 @@ function str_toHex(s) {
 }
 
 function grab_form() {
-    let arr = [];
+    let arr = {};
     $("form#entryForm :input").each(function() {
          var input = $(this);
-         let query = "";
          if(input.attr("type") == "checkbox") {
-            query = input.attr('id') + "=" + input.is(':checked');
+            arr[input.attr('id')] = "" + input.is(':checked');
          } else if(input.attr("type") == "text") {
-            var vv = str_toHex(input.val());
-            query = input.attr('id') + "=" + vv;
+            arr[input.attr('id')] = str_toHex(input.val());
          } else if(input.attr("id") == "action_body_text") {
-            var vv = base32.encode(input.val());
-            query = input.attr('id') + "=" + vv;
+            arr[input.attr('id')] = input.val();
          } else {
-            query = input.attr('id') + "=" + input.val();
+            arr[input.attr('id')] = input.val();
          }
-         arr.push(query);
     });
-    arr.push("section=" + new URL(window.location.href).searchParams.get("section"));
-    return arr.join("&");
+    arr["section"] = new URL(window.location.href).searchParams.get("section") + "";
+    return arr;
 }
 
 function add_entry_modal() {
@@ -148,9 +144,7 @@ function show_modal_edit(jobj, oid) {
 
 function edit_submit_entry(obj) {
     $.post("/api/remove_entry", "section="+new URL(window.location.href).searchParams.get("section")+"&entry_id="+($(obj).attr("data-entry-id")), function(data, status) {
-        $.post("/api/add_entry", grab_form(), function(data, status) {
-            window.location.reload();
-        });
+        add_entry();
     });
 }
 
@@ -174,8 +168,12 @@ function remove_entry(obj) {
 }
 
 function add_entry() {
-   $.post("/api/add_entry", grab_form(), function(data, status) {
-        window.location.reload();
+   $.ajax({
+    url: "/api/add_entry",
+    type: "POST",
+    data: grab_form()
+   }).done(function() {
+       window.location.reload();
    });
 }