diff --git a/app/core/bot.py b/app/core/bot.py index 6f54369..6b2e105 100644 --- a/app/core/bot.py +++ b/app/core/bot.py @@ -3,7 +3,6 @@ import asyncio from aiogram import Bot, types from aiogram.contrib.middlewares.logging import LoggingMiddleware from aiogram.dispatcher import Dispatcher -from aiogram.dispatcher.webhook import SendMessage from aiogram.utils.callback_data import CallbackData from app.core.parse_web import ( configure_firefox_driver, @@ -42,7 +41,7 @@ def get_keyboard() -> types.InlineKeyboardMarkup: @dispatcher.callback_query_handler(stations_cb.filter(direction='home->office')) async def home_office( query: types.CallbackQuery, callback_data: dict[str, str] -) -> SendMessage: +) -> types.Message: text = parse_site( driver=driver, @@ -51,13 +50,15 @@ async def home_office( message='Остановка Б. Академическая ул, д. 15', ) - return SendMessage(query.message.chat.id, text, reply_markup=get_keyboard()) + return await bot.send_message( + query.message.chat.id, text, reply_markup=get_keyboard() + ) @dispatcher.callback_query_handler(stations_cb.filter(direction='office->home')) async def office_home( query: types.CallbackQuery, callback_data: dict[str, str] -) -> SendMessage: +) -> types.Message: text = parse_site( driver=driver, @@ -65,17 +66,24 @@ async def office_home( 'l=masstransit&ll=37.505338%2C55.800160&tab=overview&z=211', message='Остановка Улица Алабяна', ) - return SendMessage(query.message.chat.id, text, reply_markup=get_keyboard()) + return await bot.send_message( + query.message.chat.id, text, reply_markup=get_keyboard() + ) @dispatcher.message_handler(commands=['chatid']) -async def chat_id(message: types.Message) -> SendMessage: - return SendMessage(message.chat.id, message.chat.id) +async def chat_id(message: types.Message) -> types.Message: + from app.core.logger import logger + + logger.info(message) + return await bot.send_message(message.chat.id, message.chat.id) @dispatcher.message_handler() -async def echo(message: types.Message) -> SendMessage: - return SendMessage(message.chat.id, 'Выбери остановку', reply_markup=get_keyboard()) +async def echo(message: types.Message) -> types.Message: + return await bot.send_message( + message.chat.id, 'Выбери остановку', reply_markup=get_keyboard() + ) async def morning_bus_mailing(chat_ids: list[int]) -> None: diff --git a/app/main.py b/app/main.py index bb1155f..1354c29 100644 --- a/app/main.py +++ b/app/main.py @@ -60,7 +60,6 @@ def bot_webhook() -> None: async def webhook(request: web.Request) -> web.Response: data = await request.json() tg_update = Update(**data) - logger.info(data) Dispatcher.set_current(dispatcher) Bot.set_current(dispatcher.bot) await dispatcher.process_update(tg_update) @@ -70,6 +69,7 @@ async def webhook(request: web.Request) -> web.Response: async def on_startup_gunicorn(app: web.Application) -> None: await bot.set_webhook(WEBHOOK_URL) logger.info(f'Webhook set to {WEBHOOK_URL}') + asyncio_schedule() async def create_app() -> web.Application: @@ -82,7 +82,6 @@ async def create_app() -> web.Application: if __name__ == '__main__': if START_WITH_WEBHOOK: - # bot_webhook() # type: ignore app = create_app() web.run_app(app=app, host=WEBAPP_HOST, port=WEBAPP_PORT) else: