From 9731401eb2ae7cae845c682eef1f6a45c7d3426b Mon Sep 17 00:00:00 2001
From: Dmitry Afanasyev <Balshbox@gmail.com>
Date: Tue, 9 Aug 2022 22:54:54 +0300
Subject: [PATCH] send message instead of update

---
 main.py    | 12 ++++--------
 mos_gor.py |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/main.py b/main.py
index fc62327..222a077 100644
--- a/main.py
+++ b/main.py
@@ -4,7 +4,6 @@ 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.types import Message
 from aiogram.utils.callback_data import CallbackData
 from aiogram.utils.executor import start_webhook
 
@@ -43,7 +42,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]) -> None:
+async def home_office(query: types.CallbackQuery, callback_data: dict[str, str]) -> SendMessage:
 
     text = parse_site(
         driver=driver,
@@ -52,27 +51,24 @@ async def home_office(query: types.CallbackQuery, callback_data: dict[str, str])
         message='Остановка Б. Академическая ул, д. 15'
     )
 
-    # or reply INTO webhook
-    return await query.message.edit_text(text, reply_markup=get_keyboard())
+    return SendMessage(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]) -> Message:
+async def office_home(query: types.CallbackQuery, callback_data: dict[str, str]) -> SendMessage:
 
-    # or reply INTO webhook
     text = parse_site(
         driver=driver,
         url='https://yandex.ru/maps/213/moscow/stops/stop__9640288/?'
             'l=masstransit&ll=37.505338%2C55.800160&tab=overview&z=211',
         message='Остановка Улица Алабяна'
     )
-    return await query.message.edit_text(text, reply_markup=get_keyboard())
+    return SendMessage(query.message.chat.id, text, reply_markup=get_keyboard())
 
 
 @dispatcher.message_handler(commands=['chatid'])
 async def chat_id(message: types.Message) -> SendMessage:
 
-    # or reply INTO webhook
     return SendMessage(message.chat.id, message.chat.id)
 
 
diff --git a/mos_gor.py b/mos_gor.py
index 2d422ab..dbc7742 100644
--- a/mos_gor.py
+++ b/mos_gor.py
@@ -67,7 +67,7 @@ def parse_site(driver: WebDriver, url: str, message: str) -> str:
             bus_t19_arrival = element.find_element(by='class name', value='masstransit-prognoses-view__title-text')
         except NoSuchElementException:
             pass
-    answer = f'{datetime.now().strftime("%H:%M")} - {message}\n\n'
+    answer = f'{message}\n\n'
     if not all([bus_300, bus_t19]):
         return 'Автобусов 300 или Т19 не найдено. \n\nСмотри на карте :)'
     if bus_300: