matplobbot-shared 0.1.36__py3-none-any.whl → 0.1.38__py3-none-any.whl

{matplobbot_shared-0.1.36.dist-info → matplobbot_shared-0.1.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matplobbot-shared
-Version: 0.1.36
+Version: 0.1.38
 Summary: Shared library for the Matplobbot ecosystem (database, services, i18n).
 Author: Ackrome
 Author-email: ivansergeyevich@gmail.com

{matplobbot_shared-0.1.36.dist-info → matplobbot_shared-0.1.38.dist-info}/RECORD

@@ -3,9 +3,9 @@ shared_lib/database.py,sha256=lEIqM8e68RH8BCGVKk8dbZ-8JYIVB7c6l8AfhNPbYfg,21877
 shared_lib/i18n.py,sha256=VBWQWVF-k_HDiidYo_RUPyUCM7oL897z5hOw9jvOoYY,1762
 shared_lib/redis_client.py,sha256=j7AKwrSWhtEHeV25Sy0JiWLIx2EI3hFEx7suoOwxRU8,2234
 shared_lib/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shared_lib/services/schedule_service.py,sha256=9q3ob3_swshMZXNZIbvq-lIJZEcsv4luCGdCWMBwXkQ,4684
+shared_lib/services/schedule_service.py,sha256=jDbanvTdHgtKI2vR7HXLQ73Rk8gu3bPHdazHhfRSpho,4545
 shared_lib/services/university_api.py,sha256=Ui-zjfKOHCCf2Imh8CNtVOWegwuep7IB8gO9IKNUrrE,1898
-matplobbot_shared-0.1.36.dist-info/METADATA,sha256=HkO0J1f-dN0rmVRaTAo-pwTR43y533mLNMSNQ8ZMAEo,416
-matplobbot_shared-0.1.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matplobbot_shared-0.1.36.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
-matplobbot_shared-0.1.36.dist-info/RECORD,,
+matplobbot_shared-0.1.38.dist-info/METADATA,sha256=9jAVxzDnfo5k_j3Sc-bTgslKyVEOKxkoTo0Cpk7xvU0,416
+matplobbot_shared-0.1.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matplobbot_shared-0.1.38.dist-info/top_level.txt,sha256=L8mrC50YWCe19jmh_zrUZFvXSkhsnES5K6y027G1838,11
+matplobbot_shared-0.1.38.dist-info/RECORD,,

shared_lib/services/schedule_service.py

@@ -5,7 +5,7 @@ from datetime import datetime, date, time
 from collections import defaultdict
 from ics import Calendar, Event
 from zoneinfo import ZoneInfo
-from aiogram.utils.markdown import escape_md
+from aiogram.utils.markdown import hcode
 
 from shared_lib.i18n import translator
 
@@ -37,30 +37,23 @@ def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name:
     for date_str, lessons in sorted(days.items()):
         date_obj = datetime.strptime(date_str, "%Y-%m-%d").date()
         
-        day_header = f"*{date_obj.strftime('%A, %d.%m.%Y')}*"
+        day_header = f"<b>{date_obj.strftime('%A, %d.%m.%Y')}</b>"
         
         formatted_lessons = []
         for lesson in sorted(lessons, key=lambda x: x['beginLesson']):
-            # Escape all dynamic parts to prevent markdown parsing errors
-            discipline = escape_md(lesson['discipline'])
-            kind_of_work = escape_md(names_shorter[lesson['kindOfWork']])
-            lecturer = escape_md(lesson['lecturer_title'].replace('_',' '))
-            lecturer_email = escape_md(lesson.get('lecturerEmail', 'Почта не указана'))
-            group = escape_md(lesson.get('group', 'Группа не указана'))
-
             lesson_details = [
-                f"`{lesson['beginLesson']} - {lesson['endLesson']} | {lesson['auditorium']}`",
-                f"{discipline} | {kind_of_work}"
+                hcode(f"{lesson['beginLesson']} - {lesson['endLesson']} | {lesson['auditorium']}"),
+                f"{lesson['discipline']} | {names_shorter[lesson['kindOfWork']]}"
             ]
 
             if entity_type == 'group':
-                lesson_details.append(f"{lecturer}\n{lecturer_email}")
+                lesson_details.append(f"{lesson['lecturer_title'].replace('_',' ')}\n{lesson.get('lecturerEmail', 'Почта не указана')}")
             elif entity_type == 'person': # Lecturer
-                lesson_details.append(f" {group}")
+                lesson_details.append(f" {lesson.get('group', 'Группа не указана')}")
             elif entity_type == 'auditorium':
-                lesson_details.append(f"{group} | {lecturer}\n{lecturer_email}")
+                lesson_details.append(f"{lesson.get('group', 'Группа не указана')} | {lesson['lecturer_title'].replace('_',' ')}\n{lesson.get('lecturerEmail', 'Почта не указана')}")
             else: # Fallback to a generic format
-                lesson_details.append(f"{lecturer}")
+                lesson_details.append(f"{lesson['lecturer_title'].replace('_',' ')}")
 
             formatted_lessons.append("\n".join(lesson_details))