Name changes, remove redundant func param

TripSit · Nov 10, 2024 · 23d3b31 · 23d3b31
1 parent def8d3c
commit 23d3b31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/discord/commands/global/d.ai.ts b/src/discord/commands/global/d.ai.ts
@@ -48,7 +48,7 @@ import {
 import { SlashCommand } from '../../@types/commandDef';
 import { embedTemplate } from '../../utils/embedTemplate';
 import commandContext from '../../utils/context';
-import aiChat, { aiModerate, handleMessage } from '../../../global/commands/g.ai';
+import aiChat, { aiModerate, handleAiMessageQueue } from '../../../global/commands/g.ai';
 
 /* TODO
 * only direct @ message should trigger a response
@@ -2175,7 +2175,7 @@ export async function aiMessage(
   }, 30000); // Failsafe to stop typing indicator after 30 seconds
 
   try {
-    const chatResponse = await handleMessage(messageData.author.id, aiPersona, messageList, messageData, attachmentInfo);
+    const chatResponse = await handleAiMessageQueue(aiPersona, messageList, messageData, attachmentInfo);
     response = chatResponse.response;
     promptTokens = chatResponse.promptTokens;
     completionTokens = chatResponse.completionTokens;

diff --git a/src/global/commands/g.ai.ts b/src/global/commands/g.ai.ts
@@ -123,8 +123,7 @@ const aiFunctions = [
 ];
 
 // Main function for aiChat to handle incoming messages and return a Promise with response data
-export function handleMessage(
-  userId: string,
+export function handleAiMessageQueue(
   aiPersona: ai_personas,
   messages: { role: 'user'; content: string }[],
   messageData: Message<boolean>,
@@ -134,11 +133,11 @@ export function handleMessage(
   promptTokens: number;
   completionTokens: number;
 }> {
-  if (!userQueues.has(userId)) {
-      userQueues.set(userId, { queue: [], isProcessing: false });
+  if (!userQueues.has(messageData.author.id)) {
+      userQueues.set(messageData.author.id, { queue: [], isProcessing: false });
   }
 
-  const userQueue = userQueues.get(userId)!;
+  const userQueue = userQueues.get(messageData.author.id)!;
 
   // Push the new message data into the user's queue
   return new Promise((resolve) => {
@@ -152,7 +151,7 @@ export function handleMessage(
 
       // If the user is not currently processing, start processing
       if (!userQueue.isProcessing) {
-          processNextMessage(userId);
+          processNextMessage(messageData.author.id);
       }
   });
 }