Merge pull request #69 from MikelCalvo/feature/skip_prefix_for_self

Fixed skipPrefix for selfMessage
Zain-ul-din · Oct 27, 2024 · 80dc43e · 80dc43e
2 parents f57e258 + ce42028
commit 80dc43e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/baileys/handlers/message.ts b/src/baileys/handlers/message.ts
@@ -32,7 +32,10 @@ if (ENV.DALLE_ENABLED && ENV.OPENAI_ENABLED) {
 
 // handles message
 export async function handleMessage({ client, msg, metadata }: MessageHandlerParams) {
-  const modelInfo: ModelByPrefix | undefined = Util.getModelByPrefix(metadata.text);
+  const modelInfo: ModelByPrefix | undefined = Util.getModelByPrefix(
+    metadata.text,
+    metadata.fromMe
+  );
   if (!modelInfo) {
     if (ENV.Debug) {
       console.log("[Debug] Model '" + modelInfo + "' not found");

diff --git a/src/util/Util.ts b/src/util/Util.ts
@@ -5,8 +5,17 @@ import config from '../whatsapp-ai.config';
 
 export class Util {
   public static getModelByPrefix(
-    message: string
+    message: string,
+    fromMe: Boolean
   ): { modelName: AIModels; prefix: string } | undefined {
+    if (fromMe) {
+      const defaultModelName = config.prefix.defaultModel;
+      const defaultModel = config.models[defaultModelName];
+      if (defaultModel && defaultModel.enable) {
+        return { modelName: defaultModelName as AIModels, prefix: defaultModel.prefix as string };
+      }
+    }
+
     for (let [modelName, model] of Object.entries(config.models)) {
       const currentModel = model as IModelConfig;
       if (!currentModel.enable) continue;