Merge branch 'deploy/cicd'

added Dockerfile and docker-compose.yaml with krakend api gateway and
monitoring using influxdb and grafana dashboard

1 files changed, 5 insertions, 5 deletions

diff --git a/bot.py b/bot.py
index 1d59f9e..bcfab8f 100644
--- a/bot.py
+++ b/bot.py
@@ -8,7 +8,7 @@ from config import BOT_TOKEN, TELEGRAM_WEBHOOK_URL, HEALTHCHECK_URL, FEDI_LOGIN_
 import uvicorn
 from starlette.applications import Starlette
 from starlette.requests import Request
-from starlette.responses import PlainTextResponse, Response
+from starlette.responses import PlainTextResponse, Response, JSONResponse
 from starlette.routing import Route
 from telegram import Update
 from telegram.ext import (
@@ -188,12 +188,12 @@ async def main() -> None:
     await application.bot.set_webhook(url=f"{BOT_DOMAIN}{TELEGRAM_WEBHOOK_URL}")
 
     # Set up webserver
-    async def telegram_webhook(request: Request) -> Response:
+    async def telegram_webhook(request: Request) -> JSONResponse:
         """Handle incoming Telegram updates by putting them into the `update_queue`"""
         await application.update_queue.put(
             Update.de_json(data=await request.json(), bot=application.bot)
         )
-        return Response()
+        return JSONResponse({'OK': 200})
 
     async def fedi_oauth_login_callback(request: Request) -> PlainTextResponse:
         """
@@ -221,7 +221,7 @@ async def main() -> None:
         routes=[
             Route(TELEGRAM_WEBHOOK_URL, telegram_webhook, methods=["POST"]),
             Route(HEALTHCHECK_URL, healthcheck, methods=["GET"]),
-            Route(FEDI_LOGIN_CALLBACK_URL, fedi_oauth_login_callback, methods=["POST", "GET"]),
+            Route(FEDI_LOGIN_CALLBACK_URL, fedi_oauth_login_callback, methods=["GET"]),
         ]
     )
     webserver = uvicorn.Server(
@@ -229,7 +229,7 @@ async def main() -> None:
             app=starlette_app,
             port=BOT_PORT,
             use_colors=False,
-            host="100.93.242.2",
+            host="0.0.0.0",
         )
     )