Upload main.py

main.py

@@ -162,63 +162,19 @@ async def receive_update(req: Request):
     processed_message_ids.add(msg_id)
 
     # ① Handle button-reply taps first
-    if msg.get("type") == "button":
-        payload = msg["button"]["payload"]
+    if msg.get("type") == "interactive" and msg["interactive"]["type"] == "button_reply":
+        payload = msg["interactive"]["button_reply"]["id"]
         if payload == "open_gallery":
-            # Send as interactive message to force new message behavior
-            url = f"https://graph.facebook.com/v23.0/{PHONE_NUMBER_ID}/messages"
-            headers = {
-                "Authorization": f"Bearer {WHATSAPP_API_TOKEN}",
-                "Content-Type": "application/json"
-            }
-            gallery_payload = {
-                "messaging_product": "whatsapp",
-                "to": wa_id,
-                "type": "interactive",
-                "interactive": {
-                    "type": "button",
-                    "body": {
-                        "text": "👍 Please tap the 📎 icon below and select \"Photo & Video Library\" to pick your ID image."
-                    },
-                    "action": {
-                        "buttons": [
-                            {
-                                "type": "reply",
-                                "reply": {"id": "got_it", "title": "Got it!"}
-                            }
-                        ]
-                    }
-                }
-            }
-            httpx.post(url, headers=headers, json=gallery_payload)
+            send_whatsapp_message(
+                wa_id,
+                "👍 Great! Tap the 📎 (paper-clip) icon below and choose \"Photo & Video Library\" to select your ID image."
+            )
         elif payload == "open_camera":
-            # Send as interactive message to force new message behavior
-            url = f"https://graph.facebook.com/v23.0/{PHONE_NUMBER_ID}/messages"
-            headers = {
-                "Authorization": f"Bearer {WHATSAPP_API_TOKEN}",
-                "Content-Type": "application/json"
-            }
-            camera_payload = {
-                "messaging_product": "whatsapp",
-                "to": wa_id,
-                "type": "interactive",
-                "interactive": {
-                    "type": "button",
-                    "body": {
-                        "text": "📸 Please tap the 📷 icon next to the text box to take a photo of your ID now."
-                    },
-                    "action": {
-                        "buttons": [
-                            {
-                                "type": "reply",
-                                "reply": {"id": "got_it", "title": "Got it!"}
-                            }
-                        ]
-                    }
-                }
-            }
-            httpx.post(url, headers=headers, json=camera_payload)
-        return JSONResponse({"status":"handled_button"})
+            send_whatsapp_message(
+                wa_id,
+                "📸 Okay—tap the 📷 (camera) icon next to the text box to take and send a photo of your ID now."
+            )
+        return JSONResponse({"status":"handled_button", "payload":payload})
 
     # TEXT: prompt with Quick-Reply buttons
     if msg.get("type") == "text":