From f30e5eccf2b9971699e56e5d975c65826e35bb97 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Wed, 5 Aug 2026 03:18:50 -0500 Subject: [PATCH] refac --- cptr/routers/bridge.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cptr/routers/bridge.py b/cptr/routers/bridge.py index a1bdebb..ba072b2 100644 --- a/cptr/routers/bridge.py +++ b/cptr/routers/bridge.py @@ -228,26 +228,31 @@ async def verify_token(request: Request, body: TokenVerify): try: if body.platform == "telegram": from cptr.utils.adapters.telegram import verify_token as tg_verify + info = await tg_verify(body.token) return {"ok": True, "info": {"username": info.get("username"), "id": info.get("id")}} elif body.platform == "discord": from cptr.utils.adapters.discord import verify_token as dc_verify + info = await dc_verify(body.token) return {"ok": True, "info": {"username": info.get("username"), "id": info.get("id")}} elif body.platform == "slack": from cptr.utils.adapters.slack import verify_token as slack_verify + info = await slack_verify(body.token) return {"ok": True, "info": {"username": info.get("username"), "id": info.get("id")}} elif body.platform == "whatsapp": from cptr.utils.adapters.whatsapp import verify_token as wa_verify + info = await wa_verify(body.token) return {"ok": True, "info": {"username": info.get("username"), "id": info.get("id")}} elif body.platform == "signal": from cptr.utils.adapters.signal import verify_token as sig_verify + info = await sig_verify(body.token) return {"ok": True, "info": {"username": info.get("username"), "id": info.get("id")}} @@ -265,21 +270,21 @@ webhook_router = APIRouter(prefix="/api/webhooks", tags=["webhooks"]) @webhook_router.get("/whatsapp/{bot_id}") -async def whatsapp_webhook_verify(bot_id: str, request: Request): +async def whatsapp_webhook_verify(request: Request, bot_id: str): """Meta webhook verification challenge (GET).""" mode = request.query_params.get("hub.mode") - token = request.query_params.get("hub.verify_token") challenge = request.query_params.get("hub.challenge") if mode == "subscribe" and challenge: # Accept any verify_token for now — user sets it in Meta dashboard from starlette.responses import PlainTextResponse + return PlainTextResponse(challenge) raise HTTPException(403, "Verification failed") @webhook_router.post("/whatsapp/{bot_id}") -async def whatsapp_webhook_inbound(bot_id: str, request: Request): +async def whatsapp_webhook_inbound(request: Request, bot_id: str): """Receive inbound WhatsApp messages via webhook.""" payload = await request.json() @@ -290,6 +295,7 @@ async def whatsapp_webhook_inbound(bot_id: str, request: Request): adapter = bot_manager._adapters.get(bot_id) if adapter: from cptr.utils.adapters.whatsapp import WhatsAppAdapter + if isinstance(adapter, WhatsAppAdapter): await adapter.handle_webhook(payload)