mirror of
https://github.com/Balshgit/mosgortrans.git
synced 2025-09-11 13:00:40 +03:00
send message instead of update
This commit is contained in:
parent
eb6fbe56fa
commit
9731401eb2
12
main.py
12
main.py
@ -4,7 +4,6 @@ from aiogram import Bot, types
|
|||||||
from aiogram.contrib.middlewares.logging import LoggingMiddleware
|
from aiogram.contrib.middlewares.logging import LoggingMiddleware
|
||||||
from aiogram.dispatcher import Dispatcher
|
from aiogram.dispatcher import Dispatcher
|
||||||
from aiogram.dispatcher.webhook import SendMessage
|
from aiogram.dispatcher.webhook import SendMessage
|
||||||
from aiogram.types import Message
|
|
||||||
from aiogram.utils.callback_data import CallbackData
|
from aiogram.utils.callback_data import CallbackData
|
||||||
from aiogram.utils.executor import start_webhook
|
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'))
|
@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(
|
text = parse_site(
|
||||||
driver=driver,
|
driver=driver,
|
||||||
@ -52,27 +51,24 @@ async def home_office(query: types.CallbackQuery, callback_data: dict[str, str])
|
|||||||
message='Остановка Б. Академическая ул, д. 15'
|
message='Остановка Б. Академическая ул, д. 15'
|
||||||
)
|
)
|
||||||
|
|
||||||
# or reply INTO webhook
|
return SendMessage(query.message.chat.id, text, reply_markup=get_keyboard())
|
||||||
return await query.message.edit_text(text, reply_markup=get_keyboard())
|
|
||||||
|
|
||||||
|
|
||||||
@dispatcher.callback_query_handler(stations_cb.filter(direction='office->home'))
|
@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(
|
text = parse_site(
|
||||||
driver=driver,
|
driver=driver,
|
||||||
url='https://yandex.ru/maps/213/moscow/stops/stop__9640288/?'
|
url='https://yandex.ru/maps/213/moscow/stops/stop__9640288/?'
|
||||||
'l=masstransit&ll=37.505338%2C55.800160&tab=overview&z=211',
|
'l=masstransit&ll=37.505338%2C55.800160&tab=overview&z=211',
|
||||||
message='Остановка Улица Алабяна'
|
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'])
|
@dispatcher.message_handler(commands=['chatid'])
|
||||||
async def chat_id(message: types.Message) -> SendMessage:
|
async def chat_id(message: types.Message) -> SendMessage:
|
||||||
|
|
||||||
# or reply INTO webhook
|
|
||||||
return SendMessage(message.chat.id, message.chat.id)
|
return SendMessage(message.chat.id, message.chat.id)
|
||||||
|
|
||||||
|
|
||||||
|
@ -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')
|
bus_t19_arrival = element.find_element(by='class name', value='masstransit-prognoses-view__title-text')
|
||||||
except NoSuchElementException:
|
except NoSuchElementException:
|
||||||
pass
|
pass
|
||||||
answer = f'{datetime.now().strftime("%H:%M")} - {message}\n\n'
|
answer = f'{message}\n\n'
|
||||||
if not all([bus_300, bus_t19]):
|
if not all([bus_300, bus_t19]):
|
||||||
return 'Автобусов 300 или Т19 не найдено. \n\nСмотри на карте :)'
|
return 'Автобусов 300 или Т19 не найдено. \n\nСмотри на карте :)'
|
||||||
if bus_300:
|
if bus_300:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user