feat: add CMD_PREFIX; fix reset cmd

Author: veigamann

src/clients/whatsapp.ts

@@ -2,7 +2,7 @@ import qrcode from "qrcode";
 import WAWebJS, { Message } from "whatsapp-web.js";
 import { handleMessage } from "../handlers/message";
 import { handleSelfMessage } from "../handlers/message/self";
-import { BOT_PREFIX } from "../constants";
+import { BOT_PREFIX, CMD_PREFIX } from "../constants";
 import { handleCommand } from "../handlers/command";
 import { shouldIgnore } from "../helpers/message";
 
@@ -53,7 +53,7 @@ whatsapp.on("ready", async () => {
 whatsapp.on("message", async (message) => {
   if (await shouldIgnore(message)) return;
 
-  const isCommand = message.body.startsWith("!");
+  const isCommand = message.body.startsWith(CMD_PREFIX);
   if (isCommand) {
     return handleCommand(message);
   } else {

src/constants.ts

@@ -2,6 +2,7 @@ import dotenv from "dotenv";
 import dotenvExpand from "dotenv-expand";
 dotenvExpand.expand(dotenv.config());
 
+export const CMD_PREFIX = process.env.CMD_PREFIX?.trim() || "!";
 export const REPLY_RRULES = process.env.REPLY_RRULES || "true";
 export const ENABLE_REACTIONS = process.env.ENABLE_REACTIONS || "true";
 export const ENABLE_SOURCES = process.env.ENABLE_SOURCES || "true";

src/crud/conversation.ts

@@ -2,7 +2,6 @@
 // @ts-ignore
 import { BingAIClientResponse } from "@waylaidwanderer/chatgpt-api";
 import { prisma } from "../clients/prisma";
-import { Chat, Message } from "whatsapp-web.js";
 
 export async function createConversation(
   completion: BingAIClientResponse,
@@ -24,16 +23,23 @@ export async function createConversation(
   });
 }
 
+export async function deleteAllConversations() {
+  await prisma.cache.deleteMany();
+  return await prisma.bingConversation.deleteMany();
+}
+
 export async function deleteConversation(chatId: string) {
-  const conversation = await prisma.bingConversation.delete({
-    where: { waChatId: chatId },
-    select: { jailbreakId: true },
-  });
+  const conversation = await getConversationFor(chatId);
+  if (!conversation) return;
 
   if (conversation.jailbreakId)
     await prisma.cache.delete({
       where: { key: `bing:${conversation.jailbreakId}` },
     });
+
+  return await prisma.bingConversation.delete({
+    where: { waChatId: chatId },
+  });
 }
 
 export async function getConversationFor(chatId: string) {

src/handlers/command/index.ts

@@ -1,26 +1,26 @@
 import { Message } from "whatsapp-web.js";
 import { setStatusFor } from "../../helpers/message";
 import { log } from "../../helpers/utils";
-import { BOT_PREFIX } from "../../constants";
+import { BOT_PREFIX, CMD_PREFIX } from "../../constants";
 import { handleJailbreak } from "./jailbreak";
 import { handleReset } from "./reset";
 
 export async function handleCommand(message: Message) {
-  const [command, ..._args] = message.body.split(" ");
+  const [command, ..._args] = message.body.split(CMD_PREFIX)[1].split(" ");
   const args = _args.join(" ");
   let reply: Message;
 
   await log(message);
   await setStatusFor(message, "working");
 
   switch (command) {
-    case "!ping":
+    case "ping":
       reply = await message.reply(BOT_PREFIX + "pong!");
       break;
-    case "!reset":
+    case "reset":
       reply = await handleReset(message, args);
       break;
-    case "!jailbreak":
+    case "jailbreak":
       reply = await handleJailbreak(message, args);
       break;
     default:

src/handlers/command/reset.ts

@@ -1,26 +1,30 @@
 import { Message } from "whatsapp-web.js";
 import { prisma } from "../../clients/prisma";
 import { BOT_PREFIX } from "../../constants";
-import { deleteConversation } from "../../crud/conversation";
+import {
+  deleteAllConversations,
+  deleteConversation,
+  getConversationFor,
+} from "../../crud/conversation";
 
 type ResetArgs = "all" | (string & {});
 
 export async function handleReset(message: Message, args: ResetArgs) {
   let reply: Message;
 
+  const chat = await message.getChat();
+  const waChat = await prisma.wAChat.findFirst({
+    where: { id: chat.id._serialized },
+  });
+
   switch (args) {
-    case "all":
-      await prisma.bingConversation.deleteMany();
+    case "all": // TODO: only superusers/bot owner should be able to do this
+      await deleteAllConversations();
       reply = await message.reply(BOT_PREFIX + "deleted all conversations");
       break;
     default:
-      const chat = await message.getChat();
-      const conversation = await prisma.bingConversation.findFirst({
-        where: { waChatId: chat.id._serialized },
-      });
-
-      if (conversation) {
-        await deleteConversation(chat.id._serialized);
+      if (waChat) {
+        await deleteConversation(waChat.id);
         reply = await message.reply(BOT_PREFIX + "deleted this conversation");
         break;
       }