self/ruz-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Administrator 2022-10-27 00:47:39 +03:00
parent 3ac48d67d1
commit 13c8e73682
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemons/notify.py
View File

@ -18,11 +18,11 @@ def process():
"begin": {"$lte": time_now + datetime.timedelta(minutes=user["notify_minutes"])}, "begin": {"$lte": time_now + datetime.timedelta(minutes=user["notify_minutes"])},
"notified": False "notified": False
}): }):
ans = "" ans = f"Дата: {lesson['begin'].strftime('%d.%m')}\n"
ans += f"Дисциплина: {lesson['discipline']}\n" ans += f"Дисциплина: {lesson['discipline']}\n"
ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n" ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n"
ans += f"Начало: {lesson['begin'].strftime('%d.%m %H:%M')}\n" ans += f"Начало: {lesson['begin'].strftime('%H:%M')}\n"
ans += f"Конец: {lesson['end'].strftime('%d.%m %H:%M')}\n" ans += f"Конец: {lesson['end'].strftime('%H:%M')}\n"
ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n" ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n"
try: try:
bot.send_message( bot.send_message(

2
helpers/keyboards.py
View File

@ -53,7 +53,7 @@ def again_keyboard():
def groups_keyboard(data): def groups_keyboard(data):
kb = telebot.types.ReplyKeyboardMarkup(True, False) kb = telebot.types.ReplyKeyboardMarkup(True, False)
for entity in data: for entity in data:
kb.row(entity['description'].capitalize()) kb.row(entity['description'])
kb.row("Начать заново") kb.row("Начать заново")
return kb return kb

14
helpers/ruz.py
View File

@ -29,7 +29,10 @@ class RUZ:
except: except:
return None return None
if data.status_code == 200: if data.status_code == 200:
return data.json() data = data.json()
for index, value in enumerate(data):
data[index]['description'] = value['description'].capitalize()
return data
return None return None
def get_schedule(self, user: User, begin_date: datetime.datetime, end_date: datetime.datetime): def get_schedule(self, user: User, begin_date: datetime.datetime, end_date: datetime.datetime):
@ -58,11 +61,16 @@ class RUZ:
def schedule_builder(self, lessons: list[dict]) -> str: def schedule_builder(self, lessons: list[dict]) -> str:
ans = "" ans = ""
last_date = None
for lesson in lessons: for lesson in lessons:
date = lesson['begin'].strftime('%d.%m')
if date != last_date:
last_date = date
ans += f"Дата: {date}\n"
ans += f"Дисциплина: {lesson['discipline']}\n" ans += f"Дисциплина: {lesson['discipline']}\n"
ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n" ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n"
ans += f"Начало: {lesson['begin'].strftime('%d.%m %H:%M')}\n" ans += f"Начало: {lesson['begin'].strftime('%H:%M')}\n"
ans += f"Конец: {lesson['end'].strftime('%d.%m %H:%M')}\n" ans += f"Конец: {lesson['end'].strftime('%H:%M')}\n"
ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n" ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n"
ans += "_______________\n" ans += "_______________\n"
return ans return ans