From c19f8c8f71d7e2e1bd539fe2d82e506c3e4fcce4 Mon Sep 17 00:00:00 2001 From: Akiru Date: Fri, 26 Jan 2024 07:40:32 +0000 Subject: [PATCH] bot/mod.ts aktualisiert --- bot/mod.ts | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/bot/mod.ts b/bot/mod.ts index 71177bf..1d0e761 100644 --- a/bot/mod.ts +++ b/bot/mod.ts @@ -1,7 +1,3 @@ - -// This new serve here is an issue, since there is already another serve for the UI in /api/mod.ts -import { serve } from "https://deno.land/std/http/server.ts"; -// End of issue import { sequentialize } from "grammy_runner"; import { Api, Bot, Context, RawApi, session, SessionFlavor } from "grammy"; import { FileFlavor, hydrateFiles } from "grammy_files"; @@ -177,35 +173,26 @@ bot.command("crash", () => { throw new Error("Crash command used"); }); -// New section that uses a webhook instead of long polling. - -// Set up the webhook and initialize the bot -await bot.api.setWebhook('https://YOUR_URL:8443/webhook'); +// Set up the webhook in the telegram API and initialize the bot +await bot.api.setWebhook('https://nyxdev.akiru.de:8443/webhook'); await bot.init(); -// Function to handle incoming requests -async function handleRequest(req: Request): Promise { - if (req.method === "POST" && new URL(req.url).pathname === "/webhook") { - try { - const body = await req.json(); - console.log("Received webhook data:", JSON.stringify(body, null, 2)); +// Function to handle incoming webhook requests +export async function handleWebhook(req: Request): Promise { + try { + const body = await req.json(); + console.log("Received webhook data:", JSON.stringify(body, null, 2)); - // Log before processing update - console.log("Processing update through handleUpdate..."); - await bot.handleUpdate(body); // Process the update - // Log after processing update - console.log("Update processed successfully."); + // Log before processing update + console.log("Processing update through handleUpdate..."); + await bot.handleUpdate(body); // Process the update + // Log after processing update + console.log("Update processed successfully."); - return new Response(JSON.stringify({ status: 'ok' }), { headers: { 'Content-Type': 'application/json' } }); - } catch (error) { - // Detailed error logging - console.error("Error in handleRequest or handleUpdate:", error); - return new Response("Error", { status: 500 }); - } + return new Response(JSON.stringify({ status: 'ok' }), { headers: { 'Content-Type': 'application/json' } }); + } catch (error) { + // Detailed error logging + console.error("Error in handleWebhook:", error); + return new Response("Error", { status: 500 }); } - return new Response("Not Found", { status: 404 }); -} - -// Start the server -console.log("Listening for webhooks on https://nyx.akiru.de:8443/webhook"); -await serve(handleRequest, { port: 8443 }); +} \ No newline at end of file