From daffc19f92a8464591b3691883f24d97a5968452 Mon Sep 17 00:00:00 2001
From: liamcottle <liam@liamcottle.com>
Date: Mon, 8 Jul 2024 23:10:21 +1200
Subject: [PATCH] delete lxmf messages by hash as ui might not have an id yet

---
 public/index.html |  2 +-
 web.py            | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/index.html b/public/index.html
index c7c6686..c15b5f3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2291,7 +2291,7 @@
                     }
 
                     // delete lxmf message from server
-                    await window.axios.delete(`/api/v1/lxmf-messages/${chatItem.lxmf_message.id}`);
+                    await window.axios.delete(`/api/v1/lxmf-messages/${chatItem.lxmf_message.hash}`);
 
                     // remove lxmf message from chat items using hash, as other pending items might not have an id yet
                     this.chatItems = this.chatItems.filter((item) => {
diff --git a/web.py b/web.py
index 088eb75..d122cdb 100644
--- a/web.py
+++ b/web.py
@@ -797,20 +797,20 @@ class ReticulumMeshChat:
             })
 
         # delete lxmf message
-        @routes.delete("/api/v1/lxmf-messages/{id}")
+        @routes.delete("/api/v1/lxmf-messages/{hash}")
         async def index(request):
 
             # get path params
-            id = request.match_info.get("id", None)
+            hash = request.match_info.get("hash", None)
 
-            # source_hash is required
-            if id is None:
+            # hash is required
+            if hash is None:
                 return web.json_response({
-                    "message": "id is required",
+                    "message": "hash is required",
                 }, status=422)
 
-            # delete lxmf messages from db where id matches
-            database.LxmfMessage.delete_by_id(id)
+            # delete lxmf messages from db where hash matches
+            database.LxmfMessage.delete().where((database.LxmfMessage.hash == hash)).execute()
 
             return web.json_response({
                 "message": "ok",