zatups/bot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add: FIXME points

Browse source
This commit is contained in:
синечка ♡ 2026-08-30 13:57:10 +03:00
parent a8bd42a531
commit cad73e0577
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bot/main/register_user.py
View file

@ -48,7 +48,7 @@ def start(message: Message):
Просто имей это ввиду😥 Просто имей это ввиду😥
''') ''')
#EDIT #FIXME
send(message, 'Выбери свой факультет' if not u else '<i>Вы начали процедуру перезапуска бота. Все настройки и данные удалены, включая уведомления</i>\nВыбери новый факультет', reply_markup = Markup.selectTopic()) send(message, 'Выбери свой факультет' if not u else '<i>Вы начали процедуру перезапуска бота. Все настройки и данные удалены, включая уведомления</i>\nВыбери новый факультет', reply_markup = Markup.selectTopic())

2
models/bot.py
View file

@ -167,7 +167,7 @@ class Markup_v1:
@staticmethod @staticmethod
def selectGroup(query: str) -> ReplyKeyboardMarkup: def selectGroup(query: str) -> ReplyKeyboardMarkup:
#EDIT #FIXME
schedule = sc.ScheduleDB(api_url=config.SCHEDULE_BASE_URL) schedule = sc.ScheduleDB(api_url=config.SCHEDULE_BASE_URL)
groupList = schedule.query(sc.Group).filter_by(name=query) groupList = schedule.query(sc.Group).filter_by(name=query)

6
models/schedule.py
View file

@ -5,7 +5,7 @@ import config as _config
dayStrings = ['Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'] dayStrings = ['Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье']
class Lesson: class Lesson:
#EDIT: фулл переделать потому-что формат поменялся сильно #FIXME: фулл переделать потому-что формат поменялся сильно
def __init__(self, start_end: str, data: dict) -> None: def __init__(self, start_end: str, data: dict) -> None:
self.start: list[int] = [ self.start: list[int] = [
int(start_end.split(' - ')[0].split(':')[0]), int(start_end.split(' - ')[0].split(':')[0]),
@ -67,7 +67,7 @@ class Lesson:
return f'''\ return f'''\
<blockquote>\ <blockquote>\
<b>{self.name}</b> <b>{self.name}</b>#FIXME
{dateStr} {dateStr}
{wrb[2:] if wrb else 'Дополнительная информация отсуствует'}</blockquote>''' {wrb[2:] if wrb else 'Дополнительная информация отсуствует'}</blockquote>'''
@ -105,6 +105,7 @@ class Schedule:
return self.days[self.weekDay] if self.weekDay < 5 else [] return self.days[self.weekDay] if self.weekDay < 5 else []
def getFacCourseByGroup(group: str) -> tuple[str | None, str | None]: def getFacCourseByGroup(group: str) -> tuple[str | None, str | None]:
#FIXME
for faculty, courses in _config.LOAD.items(): for faculty, courses in _config.LOAD.items():
for course in courses: for course in courses:
path = f'./timetables/{faculty} {course}.json'.replace(' ', '_') path = f'./timetables/{faculty} {course}.json'.replace(' ', '_')
@ -120,6 +121,7 @@ def getFacCourseByGroup(group: str) -> tuple[str | None, str | None]:
return None, None return None, None
def getSchedulePathByGroup(group: str) -> str | None: def getSchedulePathByGroup(group: str) -> str | None:
#FIXME
faculty, course = getFacCourseByGroup(group) faculty, course = getFacCourseByGroup(group)
return None if not faculty else f'./timetables/{faculty} {course}.json'.replace(' ', '_') return None if not faculty else f'./timetables/{faculty} {course}.json'.replace(' ', '_')

5
models/user.py
View file

@ -23,8 +23,8 @@ class User:
self.state: str | bool | None = self.data.get("state", None) self.state: str | bool | None = self.data.get("state", None)
self.topic: str | None = self.data.get("topic", None) # self.topic: str | None = self.data.get("topic", None)
self.course: str | None = self.data.get("course", None) # self.course: str | None = self.data.get("course", None)
self.group: str | None = self.data.get("group", None) self.group: str | None = self.data.get("group", None)
self.notifications: list[str] = self.data.get("notifications", []) # type: ignore self.notifications: list[str] = self.data.get("notifications", []) # type: ignore
self.valid: bool = self.data.get("valid", True) self.valid: bool = self.data.get("valid", True)
@ -53,6 +53,7 @@ class User:
def schedule(self) -> Schedule | None: def schedule(self) -> Schedule | None:
date = datetime.datetime.now() date = datetime.datetime.now()
#FIXME
path = getSchedulePathByGroup(self.group) path = getSchedulePathByGroup(self.group)
if not path: if not path:
self.valid = False self.valid = False