From fb455ea70f033efbceb5d33c25272b7ae2a180d3 Mon Sep 17 00:00:00 2001
From: Dmitry Afanasyev <Balshbox@gmail.com>
Date: Mon, 8 Aug 2022 20:01:47 +0300
Subject: [PATCH] add station buttons

---
 main.py    | 45 ++++++++++++++++++++++++++++++++++++---------
 mos_gor.py |  2 +-
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/main.py b/main.py
index ef20cc0..5130b80 100644
--- a/main.py
+++ b/main.py
@@ -4,6 +4,7 @@ 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 aiogram.utils.executor import start_webhook
 
 from mos_gor import logger, parse_site, download_gecko_driver, configure_firefox_driver
@@ -14,6 +15,38 @@ dp = Dispatcher(bot)
 dp.middleware.setup(LoggingMiddleware())
 
 
+stations_cb = CallbackData('station', 'direction')
+
+
+def get_keyboard() -> types.InlineKeyboardMarkup:
+    """
+    Generate keyboard with list of posts
+    """
+    markup = types.InlineKeyboardMarkup()
+
+    markup.row(
+        types.InlineKeyboardButton('Дом -> Офис', callback_data=stations_cb.new(direction='home->office')),
+        types.InlineKeyboardButton('Офис -> Дом', callback_data=stations_cb.new(direction='office->home')),
+    )
+    return markup
+
+
+@dp.callback_query_handler(stations_cb.filter(direction='home->office'))
+async def home_office(query: types.CallbackQuery, callback_data: dict[str, str]) -> None:
+
+    text = parse_site(driver=driver)
+
+    # or reply INTO webhook
+    return await query.answer(text)
+
+
+@dp.callback_query_handler(stations_cb.filter(direction='office->home'))
+async def office_home(query: types.CallbackQuery, callback_data: dict[str, str]) -> None:
+
+    # or reply INTO webhook
+    return await query.answer('Hello World')
+
+
 @dp.message_handler(commands=['chatid'])
 async def chat_id(message: types.Message) -> SendMessage:
 
@@ -22,17 +55,11 @@ async def chat_id(message: types.Message) -> SendMessage:
 
 
 @dp.message_handler()
-async def echo(message: types.Message) -> SendMessage:
-    # Regular request
-    # await bot.send_message(message.chat.id, message.text)
-
-    text = parse_site(driver=driver)
-
-    # or reply INTO webhook
-    return SendMessage(message.chat.id, text)
+async def echo(message: types.Message) -> None:
+    await message.reply('Выбери остановку', reply_markup=get_keyboard())
 
 
-async def send_message(chat_ids: list[int]):
+async def send_message(chat_ids: list[int]) -> None:
     text = parse_site(driver=driver)
 
     await asyncio.gather(
diff --git a/mos_gor.py b/mos_gor.py
index 11c1e32..3ddbd8e 100644
--- a/mos_gor.py
+++ b/mos_gor.py
@@ -68,6 +68,6 @@ def parse_site(driver: WebDriver) -> str:
             bus_t19_arrival = element.find_element(by='class name', value='masstransit-prognoses-view__title-text')
         except NoSuchElementException:
             pass
-    return ('Остановка Б. Академическая ул, д. 15 в сторону Москва Сити\n'
+    return ('Остановка Б. Академическая ул, д. 15 в сторону Москва Сити\n\n'
             f'Автобус {bus_300.text} - {bus_300_arrival.text}\nАвтобус {bus_t19.text} - {bus_t19_arrival.text}'
             )