matplobbot-shared 0.1.35__tar.gz → 0.1.36__tar.gz

{matplobbot_shared-0.1.35 → matplobbot_shared-0.1.36}/PKG-INFO

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

{matplobbot_shared-0.1.35 → matplobbot_shared-0.1.36}/matplobbot_shared.egg-info/PKG-INFO

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

{matplobbot_shared-0.1.35 → matplobbot_shared-0.1.36}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="matplobbot-shared",
-    version="0.1.35", # Let's use the version from your requirements.txt
+    version="0.1.36", # Let's use the version from your requirements.txt
     packages=find_packages(include=['shared_lib', 'shared_lib.*']),
     description="Shared library for the Matplobbot ecosystem (database, services, i18n).",
     author="Ackrome",

{matplobbot_shared-0.1.35 → matplobbot_shared-0.1.36}/shared_lib/database.py

@@ -108,16 +108,12 @@ async def init_db():
                 entity_id TEXT NOT NULL,
                 entity_name TEXT NOT NULL,
                 notification_time TIME NOT NULL,
-                last_schedule_hash TEXT,
                 is_active BOOLEAN DEFAULT TRUE,
+                last_schedule_hash TEXT, -- Added here for consistency
                 UNIQUE(user_id, entity_type, entity_id)
             )
             ''')
             # Add the last_schedule_hash column if it doesn't exist, for backward compatibility
-            await connection.execute('''
-            ALTER TABLE user_schedule_subscriptions
-            ADD COLUMN IF NOT EXISTS last_schedule_hash TEXT;
-            ''')
     logger.info("Database tables initialized.")
 
 async def log_user_action(user_id: int, username: str | None, full_name: str, avatar_pic_url: str | None, action_type: str, action_details: str | None):

{matplobbot_shared-0.1.35 → matplobbot_shared-0.1.36}/shared_lib/services/schedule_service.py

@@ -5,6 +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 shared_lib.i18n import translator
 
@@ -40,19 +41,26 @@ def format_schedule(schedule_data: List[Dict[str, Any]], lang: str, entity_name:
         
         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"{lesson['discipline']} | {names_shorter[lesson['kindOfWork']]}"
+                f"{discipline} | {kind_of_work}"
             ]
 
             if entity_type == 'group':
-                lesson_details.append(f"{lesson['lecturer_title'].replace('_',' ')}\n{lesson.get('lecturerEmail', 'Почта не указана')}")
+                lesson_details.append(f"{lecturer}\n{lecturer_email}")
             elif entity_type == 'person': # Lecturer
-                lesson_details.append(f" {lesson.get('group', 'Группа не указана')}")
+                lesson_details.append(f" {group}")
             elif entity_type == 'auditorium':
-                lesson_details.append(f"{lesson.get('group', 'Группа не указана')} | {lesson['lecturer_title'].replace('_',' ')}\n{lesson.get('lecturerEmail', 'Почта не указана')}")
+                lesson_details.append(f"{group} | {lecturer}\n{lecturer_email}")
             else: # Fallback to a generic format
-                lesson_details.append(f"{lesson['lecturer_title'].replace('_',' ')}")
+                lesson_details.append(f"{lecturer}")
 
             formatted_lessons.append("\n".join(lesson_details))