diff --git a/bot.py b/bot.py index 78ffb66..dfe23f1 100644 --- a/bot.py +++ b/bot.py @@ -3,6 +3,9 @@ from aiogram.client.default import DefaultBotProperties from aiogram.enums import ParseMode import yaml +from database.server import Database + +db = Database('/data/shirino.db') config = yaml.safe_load(open('../config.yaml', 'r', encoding='utf-8')) bot = Bot( token=config['telegram_token'], diff --git a/main.py b/main.py index 76a854f..a3a095c 100644 --- a/main.py +++ b/main.py @@ -6,11 +6,9 @@ from aiogram import Dispatcher from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application from commands import currency, start, settings -from database.server import Database -from bot import bot +from bot import bot, db config = yaml.safe_load(open('../config.yaml', 'r', encoding='utf-8')) -db = Database('shirino.db') async def on_startup(bot: bot) -> None: await db.connect() @@ -18,7 +16,7 @@ async def on_startup(bot: bot) -> None: await bot.set_webhook( f"{config['webhook']['base_url']}{config['webhook']['path']}", secret_token=config['webhook']['secret_token'], - allowed_updates=['inline_query', 'message'] + allowed_updates=['inline_query', 'message', 'callback_query'] )