patch

app.py

@@ -3,6 +3,7 @@ import threading
 import requests
 import logging
 import queue
+import re
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import PlainTextResponse, JSONResponse
 from FLUX import generate_image
@@ -69,7 +70,6 @@ def send_message(message_id, to_number, message, retries=3):
                 continue
             return {"error": str(e)}
 
-
 def send_image(message_id, to_number, image_path, retries=3):
     chat_id = to_number if to_number.endswith('@g.us') else to_number
     url = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendFileByUpload/{GREEN_API_TOKEN}"
@@ -86,7 +86,6 @@ def send_image(message_id, to_number, image_path, retries=3):
                 continue
             return {"error": str(e)}
 
-
 def send_audio(message_id, to_number, audio_path, retries=3):
     logging.debug("Entering send_audio")
     chat_id = to_number if to_number.endswith('@g.us') else to_number
@@ -115,15 +114,13 @@ def send_audio(message_id, to_number, audio_path, retries=3):
         logging.debug(f"Failed to open audio file: {e}")
         return {"error": str(e)}
 
-
 def response_text(message_id, chat_id, prompt):
     try:
         msg = generate_llm(prompt)
         send_message(message_id, chat_id, msg)
-    except Exception as e:
+    except Exception:
         send_message(message_id, chat_id, "There was an error processing your request.")
 
-
 def response_audio(message_id, chat_id, prompt):
     logging.debug("Entering response_audio with prompt: %s", prompt)
     try:
@@ -132,8 +129,7 @@ def response_audio(message_id, chat_id, prompt):
         if result and result[0]:
             audio_file_path, _ = result
             logging.debug("Audio file path generated: %s", audio_file_path)
-            send_result = send_audio(message_id, chat_id, audio_file_path)
-            logging.debug("Result from send_audio: %s", send_result)
+            send_audio(message_id, chat_id, audio_file_path)
             if os.path.exists(audio_file_path):
                 os.remove(audio_file_path)
                 logging.debug("Removed audio file: %s", audio_file_path)
@@ -144,7 +140,6 @@ def response_audio(message_id, chat_id, prompt):
         logging.debug("Exception in response_audio: %s", e)
         send_message(message_id, chat_id, "There was an error generating the audio. Please try again later.")
 
-
 def handle_image_generation(message_id, chat_id, prompt):
     try:
         image, image_path, returned_prompt, image_url = generate_image(prompt, message_id, message_id, image_dir)
@@ -192,17 +187,21 @@ async def whatsapp_webhook(request: Request):
     except KeyError as e:
         return JSONResponse(content={"error": f"Missing key in data: {e}"}, status_code=200)
 
-        # Ignore replies and mentions
+    # --- IGNORE replies & mentions ---
+    # 1) structured (quoted or tagged) via contextInfo
     if 'extendedTextMessageData' in message_data:
         ctx = message_data['extendedTextMessageData'].get('contextInfo', {})
-        # ignore replies
         if ctx.get('quotedMessageId'):
-            logging.debug(f"Ignoring reply message (quotedMessageId={ctx['quotedMessageId']})")
+            logging.debug(f"Ignoring quoted reply: {ctx['quotedMessageId']}")
             return {"success": True}
-        # ignore mentions
-        if ctx.get('mentionedJidList'):
-            logging.debug(f"Ignoring mention message (mentionedJidList={ctx['mentionedJidList']})")
+        if ctx.get('mentionedJid') or ctx.get('mentionedJidList'):
+            logging.debug(f"Ignoring structured mention: {ctx.get('mentionedJid') or ctx.get('mentionedJidList')}")
             return {"success": True}
+    # 2) plain-text mentions in the body (e.g. "@94750818845")
+    if chat_id.endswith('@g.us') and re.search(r'@\d+', body):
+        logging.debug(f"Ignoring plain-text mention in body: {body}")
+        return {"success": True}
+    # ------------------------------------
 
     # Enqueue tasks instead of spawning threads
     if body.lower().startswith('/imagine'):
@@ -211,9 +210,19 @@ async def whatsapp_webhook(request: Request):
             send_message(message_id, chat_id, "Please provide a prompt after /imagine.")
         else:
             send_message(message_id, chat_id, "Generating...")
-            task_queue.put({"type": "image", "message_id": message_id, "chat_id": chat_id, "prompt": prompt})
+            task_queue.put({
+                "type": "image",
+                "message_id": message_id,
+                "chat_id": chat_id,
+                "prompt": prompt
+            })
     else:
-        task_queue.put({"type": "audio", "message_id": message_id, "chat_id": chat_id, "prompt": body})
+        task_queue.put({
+            "type": "audio",
+            "message_id": message_id,
+            "chat_id": chat_id,
+            "prompt": body
+        })
 
     return {"success": True}