mirror of
https://github.com/Balshgit/mosgortrans.git
synced 2025-09-11 13:00:40 +03:00
update message to user
This commit is contained in:
parent
bb95ff0378
commit
246d49ac17
8
main.py
8
main.py
@ -72,8 +72,12 @@ async def echo(message: types.Message) -> None:
|
|||||||
|
|
||||||
|
|
||||||
async def send_message(chat_ids: list[int]) -> None:
|
async def send_message(chat_ids: list[int]) -> None:
|
||||||
text = parse_site(driver=driver)
|
text = parse_site(
|
||||||
|
driver=driver,
|
||||||
|
url='https://yandex.ru/maps/213/moscow/stops/stop__9640740/'
|
||||||
|
'?l=masstransit&ll=37.527754%2C55.823507&tab=overview&z=21',
|
||||||
|
message='Остановка Б. Академическая ул, д. 15'
|
||||||
|
)
|
||||||
await asyncio.gather(
|
await asyncio.gather(
|
||||||
*[bot.send_message(chat_id=chat_id, text=text, parse_mode=types.ParseMode.HTML) for chat_id in chat_ids]
|
*[bot.send_message(chat_id=chat_id, text=text, parse_mode=types.ParseMode.HTML) for chat_id in chat_ids]
|
||||||
)
|
)
|
||||||
|
11
mos_gor.py
11
mos_gor.py
@ -66,6 +66,11 @@ 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
|
||||||
return (f'{message}\n\n'
|
answer = f'{message}\n\n'
|
||||||
f'Автобус {bus_300.text} - {bus_300_arrival.text}\nАвтобус {bus_t19.text} - {bus_t19_arrival.text}'
|
if not all([bus_300, bus_t19]):
|
||||||
)
|
return 'Автобусов 300 или Т19 не найдено. \n\nСмотри на карте :)'
|
||||||
|
if bus_300:
|
||||||
|
answer += f'Автобус {bus_300.text} - {bus_300_arrival.text}\n'
|
||||||
|
if bus_t19:
|
||||||
|
answer += f'Автобус {bus_300.text} - {bus_300_arrival.text}\nАвтобус {bus_t19.text} - {bus_t19_arrival.text}'
|
||||||
|
return answer
|
||||||
|
Loading…
x
Reference in New Issue
Block a user