Webhook implementation

app/bot/main.py

@@ -8,6 +8,7 @@
 from app.bot.handlers import Logic
 from app.bot.polling import Polling
 from app.bot.task import MailingTask
+from app.bot.webhook import Webhook
 from app.db import AiosqliteConnection, Subscribers, create_db
 from app.logger import logger
 from app.weather import OwmWeather
@@ -34,4 +35,11 @@ async def main():
         if config.RUN_TYPE == "polling":
             await Polling(dp, tasks=[task]).run(bot)
         elif config.RUN_TYPE == "webhook":
-            ...
+            await Webhook(
+                dp,
+                [task],
+                config.WEBHOOK_URL,
+                config.WEBHOOK_PATH,
+                config.WEBHOOK_HOST,
+                config.WEBHOOK_PORT,
+            ).run(bot)

app/bot/webhook.py

@@ -31,7 +31,7 @@ def run(self, bot):
 def on_startup(bot, webhook_url, tasks):
     async def on_startup():
         """Функция перед запуском бота в режиме webhook"""
-        await bot.set_webhook(webhook_url, drop_pending_updates=True)
+        await bot.set_webhook(webhook_url)
         for task in tasks:
             task.run(bot)
 

app/config.py

@@ -13,3 +13,12 @@
 RUN_TYPE = os.getenv("RUN_TYPE", "polling")
 
 DATABASE_URL = os.getenv("DATABASE_URL", "subscribers.db")
+
+if RUN_TYPE == "webhook":
+    WEBHOOK_URL = os.getenv("WEBHOOK_URL")
+
+    WEBHOOK_PATH = os.getenv("WEBHOOK_PATH", "")
+
+    WEBHOOK_HOST = os.getenv("WEBHOOK_POST", "0.0.0.0")
+
+    WEBHOOK_PORT = os.getenv("WEBHOOK_PORT", 8080)

docker-compose-webhook.yml

@@ -0,0 +1,16 @@
+version: "3"
+services:
+  bot:
+    build: .
+    environment:
+      - BOT_TOKEN
+      - WEATHER_API_KEY
+      - RUN_TYPE
+      - DATABASE_URL
+      - WEBHOOK_URL
+      - WEBHOOK_PATH
+      - WEBHOOK_HOST
+      - WEBHOOK_PORT
+    ports:
+      - ${WEBHOOK_PORT}:8080
+    command: python -m app