message handling changes

routes/api/whatsapp_webhook.py

@@ -11,6 +11,67 @@ logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(
 
 router = APIRouter()
 
+def _extract_from_number_and_text(payload: dict):
+    """
+    Extracts (from_number, message_text) from a WhatsApp webhook payload.
+    Supports text, button, and interactive replies. Silently ignores non-message webhooks.
+    Returns (None, None) if not a user message.
+    """
+    try:
+        entries = payload.get("entry", [])
+        for entry in entries:
+            changes = entry.get("changes", [])
+            for change in changes:
+                # Only process message-type changes
+                if change.get("field") != "messages":
+                    continue
+
+                value = change.get("value", {})
+                messages_list = value.get("messages", [])
+                if not messages_list:
+                    # This may be a status/billing event without 'messages'
+                    continue
+
+                # We only look at the first message in the list for this webhook
+                msg = messages_list[0]
+                from_number = msg.get("from")
+                mtype = msg.get("type")
+
+                # 1) Plain text
+                if mtype == "text":
+                    text_body = (msg.get("text", {}) or {}).get("body")
+                    if from_number and text_body:
+                        return from_number, text_body
+
+                # 2) Template reply button (older/simple schema)
+                # payload is the stable key if you set it; fallback to text/title
+                if mtype == "button":
+                    b = msg.get("button", {}) or {}
+                    intent = b.get("payload") or b.get("text")
+                    if from_number and intent:
+                        return from_number, intent
+
+                # 3) Newer interactive replies (buttons or list)
+                if mtype == "interactive":
+                    i = msg.get("interactive", {}) or {}
+                    # Prefer stable IDs over display titles
+                    if "button_reply" in i:
+                        intent = i["button_reply"].get("id") or i["button_reply"].get("title")
+                        if from_number and intent:
+                            return from_number, intent
+                    if "list_reply" in i:
+                        intent = i["list_reply"].get("id") or i["list_reply"].get("title")
+                        if from_number and intent:
+                            return from_number, intent
+
+        # If we got here, no usable user message was found
+        return None, None
+
+    except Exception:
+        # In case of any unexpected structure, just treat as no user message
+        return None, None
+
+
 # WhatsApp/Gupshup webhook endpoint
 @router.post("/message-received")
 async def whatsapp_webhook_receiver(request: Request):
@@ -30,40 +91,22 @@ async def whatsapp_webhook_receiver(request: Request):
             logging.error("❌ Failed to decode webhook body as JSON")
             return JSONResponse(status_code=400, content={"error": "Invalid JSON format"})
 
-
-        from_number = None
-        message_text = None
-
-        # <<< FIX 2: Robustly extract data from the nested structure >>>
-        entries = incoming_message.get('entry', [])
-        for entry in entries:
-            changes = entry.get('changes', [])
-            for change in changes:
-                # We are interested in changes related to 'messages'
-                if change.get('field') == 'messages':
-                    value = change.get('value', {})
-                    messages_list = value.get('messages', [])
-                    
-                    for msg in messages_list:
-                        # Check if it's a text message and extract sender/body
-                        if msg.get('type') == 'text':
-                            from_number = msg.get('from')
-                            message_text = msg.get('text', {}).get('body')
-                            break # Found text message, exit inner loop
-                    if from_number and message_text:
-                        break # Found message, exit middle loop
-            if from_number and message_text:
-                break # Found message, exit outer loop
+        # <<< FIX 2: Robustly extract data from the nested structure (text/button/interactive) >>>
+        from_number, message_text = _extract_from_number_and_text(incoming_message)
 
         # Check if sender and message text were successfully extracted
         if not from_number or not message_text:
-            logging.warning("Received webhook without valid sender or message text in expected structure.")
-            return JSONResponse(status_code=200, content={"status": "ignored", "message": "Missing sender or text"})
+            # This is likely a status/billing webhook or a non-user message; ignore quietly
+            logging.info("Ignoring non-message webhook or missing sender/text.")
+            return JSONResponse(status_code=200, content={"status": "ignored", "message": "No user message"})
 
         logging.info(f"Message from {from_number}: {message_text}")
 
+        # Normalize intent text lightly (don't change your core logic)
+        normalized = message_text.lower().strip().replace("’", "'")
+
         # Check for specific commands to send the digest
-        if message_text.lower().strip() == "view today's headlines":
+        if normalized == "view today's headlines":
             logging.info(f"User {from_number} requested daily digest.")
             
             # Fetch the digest headlines
@@ -106,7 +149,7 @@ async def whatsapp_webhook_verify(request: Request):
     if mode == "subscribe" and challenge:
         logging.info(f"Webhook verification successful. Challenge: {challenge}")
         # Challenge needs to be returned as an integer, not string
-        return JSONResponse(status_code=200, content=int(challenge)) 
+        return JSONResponse(status_code=200, content=int(challenge))
     else:
         logging.warning(f"Webhook verification failed. Mode: {mode}, Challenge: {challenge}")
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Verification failed")
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Verification failed")