From 4564b648f7cc5a3286c6d7b326d608e43bc17bfb Mon Sep 17 00:00:00 2001
From: Danny Avila <messagedaniel@protonmail.com>
Date: Tue, 28 Mar 2023 11:42:36 -0400
Subject: [PATCH] fix: failsafe to prevent all convos clearing from delete
 button

---
 api/server/routes/convos.js                          | 8 +++++++-
 client/src/components/Conversations/DeleteButton.jsx | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/server/routes/convos.js b/api/server/routes/convos.js
index 7b2f9c72f9..656caa0e1b 100644
--- a/api/server/routes/convos.js
+++ b/api/server/routes/convos.js
@@ -41,11 +41,17 @@ router.post('/gen_title', async (req, res) => {
 
 router.post('/clear', async (req, res) => {
   let filter = {};
-  const { conversationId } = req.body.arg;
+  const { conversationId, source } = req.body.arg;
   if (conversationId) {
     filter = { conversationId };
   }
 
+  console.log('source:', source);
+
+  if (source === 'button' && !conversationId) {
+    return res.status(200).send('No conversationId provided');
+  }
+
   try {
     const dbResponse = await deleteConvos(req?.session?.user?.username, filter);
     res.status(201).send(dbResponse);
diff --git a/client/src/components/Conversations/DeleteButton.jsx b/client/src/components/Conversations/DeleteButton.jsx
index d2be57c4fc..79895169f1 100644
--- a/client/src/components/Conversations/DeleteButton.jsx
+++ b/client/src/components/Conversations/DeleteButton.jsx
@@ -21,7 +21,7 @@ export default function DeleteButton({ conversationId, renaming, cancelHandler,
     }
   );
 
-  const clickHandler = () => trigger({ conversationId });
+  const clickHandler = () => trigger({ conversationId, source: 'button' });
   const handler = renaming ? cancelHandler : clickHandler;
 
   return (