Refactor BotConfig to clarify BOT_JID comment; enhance quoted message handling in whatsapp_webhook for improved user reply processing.

app.py

@@ -22,7 +22,7 @@ class BotConfig:
     GREEN_API_ID_INSTANCE = os.getenv("GREEN_API_ID_INSTANCE")
     WEBHOOK_AUTH_TOKEN    = os.getenv("WEBHOOK_AUTH_TOKEN")
     BOT_GROUP_CHAT        = "[email protected]"
-    BOT_JID               = os.getenv("BOT_JID")          # e.g. "[email protected]"
+    BOT_JID               = os.getenv("BOT_JID")          # your bot's own WhatsApp JID
     IMAGE_DIR             = "/tmp/images"
     AUDIO_DIR             = "/tmp/audio"
     DEFAULT_IMAGE_COUNT   = 4
@@ -212,44 +212,39 @@ async def whatsapp_webhook(request: Request):
     if chat_id != BotConfig.BOT_GROUP_CHAT or data.get("typeWebhook") != "incomingMessageReceived":
         return {"success": True}
 
-    md   = data.get("messageData", {})
-    mid  = data["idMessage"]
-    text_data = md.get("textMessageData") or md.get("extendedTextMessageData")
-    if not text_data:
-        return {"success": True}
-
-    body = text_data.get("textMessage", text_data.get("text", "")).strip()
-    ctx  = text_data.get("contextInfo", {})
+    md = data.get("messageData", {})
+    mid = data["idMessage"]
 
     # --- Quoted‑reply handling ---
-    if ctx.get("quotedMessageId"):
-        # only if the quoted message was sent by our bot
-        quoted_sender = ctx.get("participant") or ctx.get("quotedMessageSender")
-        if quoted_sender == BotConfig.BOT_JID:
-            # extract quoted text
-            qm = ctx.get("quotedMessage", {})
-            if "textMessageData" in qm:
-                quoted_text = qm["textMessageData"].get("textMessage", "")
-            else:
-                quoted_text = qm.get("extendedTextMessageData", {}).get("text", "")
-            # build and send LLM reply
+    if md.get("typeMessage") == "quotedMessage":
+        ext = md.get("extendedTextMessageData", {})
+        quoted = md.get("quotedMessage", {})
+        quoted_participant = ext.get("participant")
+        # only if the quoted message was from the bot
+        if quoted_participant == BotConfig.BOT_JID:
+            user_reply  = ext.get("text", "")
+            quoted_text = quoted.get("textMessage", "")
             prompt = (
                 f"You asked: {quoted_text}\n"
-                f"User replied: {body}\n"
+                f"User replied: {user_reply}\n"
                 "Provide a helpful, concise follow‑up."
             )
             reply = generate_llm(prompt)
             client.send_message(mid, chat_id, reply)
-        # in either case, do not process further
         return {"success": True}
 
-    # --- Skip @‑mentions of others ---
+    # --- Extract normal text + skip mentions ---
+    text_data = md.get("textMessageData") or md.get("extendedTextMessageData")
+    if not text_data:
+        return {"success": True}
+    body = text_data.get("textMessage", text_data.get("text", "")).strip()
+    ctx  = text_data.get("contextInfo", {})
     if ctx.get("mentionedJidList"):
         return {"success": True}
 
     low = body.lower()
 
-    # --- COMMANDS (unchanged) ---
+    # --- COMMANDS ---
     if low == "/help":
         client.send_message(mid, chat_id, help_text)
         return {"success": True}