mirror of
https://github.com/nexy7574/LCC-bot.git
synced 2024-09-19 18:16:34 +01:00
Update timetable message function
This commit is contained in:
parent
a41670b437
commit
8735d2467b
1 changed files with 4 additions and 10 deletions
|
@ -31,6 +31,7 @@ class TimeTableCog(commands.Cog):
|
||||||
for name, dates in self.timetable["breaks"].items():
|
for name, dates in self.timetable["breaks"].items():
|
||||||
start_date = datetime.strptime(dates["start"], "%d/%m/%Y")
|
start_date = datetime.strptime(dates["start"], "%d/%m/%Y")
|
||||||
end_date = datetime.strptime(dates["end"], "%d/%m/%Y")
|
end_date = datetime.strptime(dates["end"], "%d/%m/%Y")
|
||||||
|
# noinspection PyChainedComparisons
|
||||||
if date.timestamp() <= end_date.timestamp() and date.timestamp() >= start_date.timestamp():
|
if date.timestamp() <= end_date.timestamp() and date.timestamp() >= start_date.timestamp():
|
||||||
return {"name": name, "start": start_date, "end": end_date}
|
return {"name": name, "start": start_date, "end": end_date}
|
||||||
|
|
||||||
|
@ -109,9 +110,8 @@ class TimeTableCog(commands.Cog):
|
||||||
):
|
):
|
||||||
date = date or datetime.now()
|
date = date or datetime.now()
|
||||||
_break = self.are_on_break(date)
|
_break = self.are_on_break(date)
|
||||||
if _break:
|
if _break is not None:
|
||||||
next_lesson = self.next_lesson(_break["end"] + timedelta(days=1, hours=7))
|
next_lesson = self.absolute_next_lesson(date)
|
||||||
next_lesson = next_lesson or {"name": "Unknown", "tutor": "Unknown", "room": "Unknown"}
|
|
||||||
text = (
|
text = (
|
||||||
"[tt] On break {!r} from {} until {}. Break ends {}, and the first lesson back is "
|
"[tt] On break {!r} from {} until {}. Break ends {}, and the first lesson back is "
|
||||||
"{lesson[name]!r} with {lesson[tutor]} in {lesson[room]}.".format(
|
"{lesson[name]!r} with {lesson[tutor]} in {lesson[room]}.".format(
|
||||||
|
@ -127,13 +127,7 @@ class TimeTableCog(commands.Cog):
|
||||||
if not lesson:
|
if not lesson:
|
||||||
next_lesson = self.next_lesson(date)
|
next_lesson = self.next_lesson(date)
|
||||||
if not next_lesson:
|
if not next_lesson:
|
||||||
next_lesson = await asyncio.to_thread(self.absolute_next_lesson, new_method=True)
|
next_lesson = self.absolute_next_lesson()
|
||||||
next_lesson = next_lesson or {
|
|
||||||
"name": "unknown",
|
|
||||||
"tutor": "unknown",
|
|
||||||
"room": "unknown",
|
|
||||||
"start_datetime": datetime.max,
|
|
||||||
}
|
|
||||||
text = (
|
text = (
|
||||||
"[tt] No more lessons today!\n"
|
"[tt] No more lessons today!\n"
|
||||||
f"[tt] Next Lesson: {next_lesson['name']!r} with {next_lesson['tutor']} in "
|
f"[tt] Next Lesson: {next_lesson['name']!r} with {next_lesson['tutor']} in "
|
||||||
|
|
Loading…
Reference in a new issue