From 280f1b733834767b25c3b302dc318a5437851f49 Mon Sep 17 00:00:00 2001
From: Silas Bartha <silas@exvacuum.dev>
Date: Wed, 12 Feb 2025 01:56:19 -0500
Subject: [PATCH] fixed api errors when queries miss

---
 api/api.py                    |  25 +++++++++++++++----------
 api/forum.db                  | Bin 20480 -> 20480 bytes
 src/components/chatbubble.jsx |   2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/api/api.py b/api/api.py
index d694933..f5fd677 100644
--- a/api/api.py
+++ b/api/api.py
@@ -45,8 +45,9 @@ def new_message():
     message = str(request.form['message'])
     token = request.form['token']
     res = cur.execute(f"SELECT user_id FROM user WHERE token='{token}'")
-    (user_id,) = res.fetchone()
-    if user_id is not None:
+    res = res.fetchone()
+    if res is not None:
+        (user_id,) = res
         id = str(uuid4())
         cur.execute("INSERT INTO message VALUES(?, ?, ?, ?)", (id, user_id, position, message));
         db.commit()
@@ -71,11 +72,13 @@ def remove_message():
     token = request.form['token']
     message_id = request.form['message_id']
     res = cur.execute(f"SELECT user_id FROM user WHERE token='{token}'")
-    (user_id,) = res.fetchone()
-    if user_id is not None:
+    res = res.fetchone()
+    if res is not None:
+        (user_id,) = res
         res = cur.execute(f"SELECT message_id, user_id FROM message WHERE message_id='{message_id}'")
-        (message_id, message_user_id) = res.fetchone()
-        if message_id is not None:
+        res = res.fetchone()
+        if res is not None:
+            (message_id, message_user_id) = res
             if message_user_id == user_id:
                 cur.execute(f"DELETE FROM message WHERE message_id='{message_id}'")
                 db.commit()
@@ -95,11 +98,13 @@ def edit_message():
     message_id = request.form['message_id']
     new_message = request.form['message']
     res = cur.execute(f"SELECT user_id FROM user WHERE token='{token}'")
-    (user_id,) = res.fetchone()
-    if user_id is not None and new_message is not None:
+    res = res.fetchone()
+    if res is not None and new_message is not None:
+        (user_id,) = res
         res = cur.execute(f"SELECT message_id, user_id FROM message WHERE message_id='{message_id}'")
-        (message_id, message_user_id) = res.fetchone()
-        if message_id is not None:
+        res = res.fetchone()
+        if res is not None:
+            (message_id, message_user_id) = res
             if message_user_id == user_id:
                 cur.execute(f"UPDATE message SET message = '{new_message}' WHERE message_id='{message_id}'");
                 db.commit()
diff --git a/api/forum.db b/api/forum.db
index 12e3048fd151b24e4dd281138a886bcfc6f6afdc..89ba061ee176d7194d50103e5fdae71deab6d564 100644
GIT binary patch
delta 225
zcma*hzYf7b8~|YLKw{{{z(S~`i=<cgx4+(kq=V7aNhDehNyBE>c!5eMo59|QN9n-h
zcm>}Re3yrDc^G-u=-hgt(Rr<(<ECj<HI!PF6}~cQ72zbuS=+2fQPvphtrT$*NURBP
zEPTDgiGUqu1T=6-w{a2|{ed%IQcw9o06wRLa-ft**T&pqOi-ePB#cX7z+Ibr3Is3#
rpqTWPV6ZyHM{REodcQBy>Ah*9vWC8>MCH3RJEP*dAkJTr&tmigaO^z!

delta 224
zcmZozz}T>Wae_3X=tLQ3M$wH4OZ2%I`Lh}Lv-$4wId5z<<(uqmH^E#XFEKY&AuBa4
zt&yLJEi|-|RXoi&&C<v$%}CeOB-u#U#4OoV*U}=@Sl1{i)xs>rG}+Y9$YOGVovMwI
zp0T01g^8J&xuK<jsfCH5j)JbSo{0%i%-qz((89vpz{to*M**k~C~0VJY-(y~ZeV6=
nWE`6@Iop0F&^<R8_;2v9=U=~B(4mxna<jjI3Q@LS_tyjfCht32

diff --git a/src/components/chatbubble.jsx b/src/components/chatbubble.jsx
index 9494ecb..14368ec 100644
--- a/src/components/chatbubble.jsx
+++ b/src/components/chatbubble.jsx
@@ -69,7 +69,7 @@ export default function ChatBubble({ id, position, text }) {
                             setMessages(data);
                         });
                     } else if (res.status == 401) {
-                        alert('you are not allowed to delete this')
+                        alert('you are not allowed to edit this')
                     }
                 });
             }