Merge pull request #9

refactor: simplify deadline filtering and message generation logic

main.py

@@ -7,6 +7,7 @@ from aiogram import Bot
 import datetime as dt
 import locale
 import urllib.parse
+import re
 
 # Modify the links and data below:
 DEADLINES_URL = "https://m3104.nawinds.dev/DEADLINES.json"
@@ -15,8 +16,8 @@ BOT_NAME = "Дединсайдер M3104"
 BOT_USERNAME = "m3104_deadliner_bot"
 
 # Environment variables that should be available:
-TOKEN = os.getenv("TOKEN")
+TOKEN: str = os.getenv("TOKEN") # type: ignore
-MAIN_GROUP_ID = int(os.getenv("MAIN_GROUP_ID"))
+MAIN_GROUP_ID = int(os.getenv("MAIN_GROUP_ID")) # type: ignore
 
 logging.basicConfig(level=logging.INFO)
 
@@ -24,7 +25,7 @@ bot = Bot(TOKEN)
 
 NUMBER_EMOJIS = ['0.', '1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣', '6️⃣', '7️⃣', '8️⃣', '9️⃣', '🔟']
 
-async def get_current_time() -> str:
+def get_current_time() -> str:
     current_time = dt.datetime.now()
     current_time_hour = current_time.hour if current_time.hour >= 10 else "0" + str(current_time.hour)
     current_time_minute = current_time.minute if current_time.minute >= 10 else "0" + str(current_time.minute)
@@ -35,7 +36,7 @@ def get_dt_obj_from_string(time: str) -> dt.datetime:
     locale.setlocale(locale.LC_TIME, 'en_US.UTF-8')
     return dt.datetime.strptime(time, "%d %b %Y %H:%M:%S %z")
 
-async def generate_link(event_name: str, event_time: str) -> str:
+def generate_link(event_name: str, event_time: str) -> str:
     dt_obj = get_dt_obj_from_string(event_time)
     formatted_time = dt_obj.strftime("%Y%m%d T%H%M%S%z")
     description = f"Дедлайн добавлен ботом {BOT_NAME} (https://t.me/{BOT_USERNAME})"
@@ -45,7 +46,7 @@ async def generate_link(event_name: str, event_time: str) -> str:
            f"color=6"
     return link
 
-async def get_human_timedelta(time: str) -> str:
+def get_human_timedelta(time: str) -> str:
     dt_obj = get_dt_obj_from_string(time)
     dt_now = dt.datetime.now(dt_obj.tzinfo)  # Ensure timezones are consistent
     delta = dt_obj - dt_now
@@ -64,7 +65,7 @@ async def get_human_timedelta(time: str) -> str:
     else:
         return f"{hours}ч {minutes}м"
 
-async def get_human_time(time: str) -> str:
+def get_human_time(time: str) -> str:
     dt_obj = get_dt_obj_from_string(time)
     locale.setlocale(locale.LC_TIME, 'ru_RU.UTF-8')
     formatted_date = dt_obj.strftime("%a, %d %B в %H:%M")
@@ -78,20 +79,15 @@ def timestamp_func(a: dict) -> float:
 
 def relevant_filter_func(d: dict) -> bool:
     dt_obj = get_dt_obj_from_string(d["time"])
-    if dt_obj < dt.datetime.now(dt_obj.tzinfo):
+    return not dt_obj < dt.datetime.now(dt_obj.tzinfo)
-        return False
-    return True
 
-def deadline_type_filter_func(d: dict, dtype: str) -> bool:
+def deadline_type_filter_func(d: dict, dtype: str = '') -> bool:
-    if f"[{dtype.lower()}]" in d["name"].lower():
+    if not dtype:
-        return True
+        return not re.match(r'^\[.*\]', d['name'])
-    return False
 
-def deadlines_filter_func(d: dict) -> bool:
+    return f"[{dtype.lower()}]" in d["name"].lower()
-    return (not deadline_type_filter_func(d, "тест") and
-            not deadline_type_filter_func(d, "лекция"))
 
-async def get_message_text() -> str:
+def get_message_text() -> str:
     try:
         response = requests.get(DEADLINES_URL).json()
     except Exception as e:
@@ -99,89 +95,62 @@ async def get_message_text() -> str:
         return ""
     all_deadlines = response["deadlines"]
 
-    deadlines = list(filter(lambda d: deadlines_filter_func(d) and relevant_filter_func(d), all_deadlines))
+    types = [
-    tests = list(filter(lambda t: deadline_type_filter_func(t, "тест") and relevant_filter_func(t), all_deadlines))
+        ('', ''), # deadlines
-    lectures = list(filter(lambda t: deadline_type_filter_func(t, "лекция") and relevant_filter_func(t), all_deadlines))
+        ('🧑‍💻 Тесты', 'тест'),
+        ('🎓 Лекции', 'лекция'),
+        ('🛡 Защиты', 'защита')
+    ]
 
-    text = f"🔥️️ <b>Дедлайны</b> (<i>Обновлено в {await get_current_time()} 🔄</i>):\n\n"
+    assignments = [(sorted(filter(lambda t: deadline_type_filter_func(t, x[1]) and relevant_filter_func(t), all_deadlines),
+                           key=lambda z: timestamp_func(z)), x[0], x[1]) for x in types]
 
-    deadlines = sorted(deadlines, key=lambda x: timestamp_func(x))
+    text = f"🔥️️ <b>Дедлайны</b> (<i>Обновлено в {get_current_time()} 🔄</i>):\n\n"
-    tests = sorted(tests, key=lambda x: timestamp_func(x))
-    lectures = sorted(lectures, key=lambda x: timestamp_func(x))
 
-    if len(deadlines) == 0:
+    if len(assignments[0]) == 0:
         text += "Дедлайнов нет)\n\n"
 
-    for i in range(len(deadlines)):
+    def add_items(items: list, category_name: str = '', replace_name: str = ''):
-        no = i + 1
+        if len(items) == 0:
-        if no < 11:
+            return
-            no = NUMBER_EMOJIS[no] + " "
-        else:
-            no += ". "
-        text += str(no) + "<b>"
 
-        if deadlines[i].get("url"):
+        nonlocal text
-            text += f"<a href='{deadlines[i]['url']}'>{deadlines[i]['name']}</a>"
+        REPLACE_PATTERN = re.compile(rf'^\[{replace_name}\]', flags=re.IGNORECASE)
-        else:
-            text += deadlines[i]["name"]
 
-        text += "</b> — "
+        if category_name:
-        text += await get_human_timedelta(deadlines[i]["time"])
+            text += f"\n<b>{category_name}</b>:\n\n"
-        text += f"\n(<a href='{await generate_link(deadlines[i]['name'], deadlines[i]['time'])}'>"
-        text += await get_human_time(deadlines[i]["time"]) + "</a>)\n\n"
 
-    if len(tests) > 0:
+        for i, item in enumerate(items):
-        text += f"\n🧑‍💻 <b>Тесты</b>:\n\n"
-
-        for i in range(len(tests)):
-            test_name = tests[i]["name"].replace("[Тест] ", "").replace("[тест]", "")
-            test_url = tests[i].get("url")
             no = i + 1
-            if no < 11:
+            if no <= 10:
                 no = NUMBER_EMOJIS[no] + " "
             else:
-                no += ". "
+                no = str(no) + ". "
-            text += str(no) + "<b>"
 
-            if test_url:
+            text += no + "<b>"
-                text += f"<a href='{test_url}'>{test_name}</a>"
+
+            name = re.sub(REPLACE_PATTERN, '', item['name'])
+            url = item.get('url')
+
+            if url:
+                text += f"<a href='{url}'>{name}</a>"
             else:
-                text += test_name
+                text += name
 
             text += "</b> — "
-            text += await get_human_timedelta(tests[i]["time"])
+            text += get_human_timedelta(item["time"])
-            text += f"\n(<a href='{await generate_link(test_name, tests[i]['time'])}'>"
+            text += f"\n(<a href='{generate_link(name, item['time'])}'>"
-            text += await get_human_time(tests[i]["time"]) + "</a>)\n\n"
+            text += get_human_time(item["time"]) + "</a>)\n\n"
 
-    if len(lectures) > 0:
+    for assignment_type in assignments:
-        text += f"\n👨‍🏫 <b>Лекции</b>:\n\n"
+        add_items(*assignment_type)
-
-        for i in range(len(lectures)):
-            lecture_name = lectures[i]["name"].replace("[Лекция] ", "").replace("[лекция]", "")
-            lecture_url = lectures[i].get("url")
-            no = i + 1
-            if no < 11:
-                no = NUMBER_EMOJIS[no] + " "
-            else:
-                no += ". "
-            text += str(no) + "<b>"
-
-            if lecture_url:
-                text += f"<a href='{lecture_url}'>{lecture_name}</a>"
-            else:
-                text += lecture_name
-
-            text += "</b> — "
-            text += await get_human_timedelta(lectures[i]["time"])
-            text += f"\n(<a href='{await generate_link(lecture_name, lectures[i]['time'])}'>"
-            text += await get_human_time(lectures[i]["time"]) + "</a>)\n\n"
 
     text += f"\n🆕 <a href='{ADD_DEADLINE_LINK}'>" \
             f"Добавить дедлайн</a>"
     return text
 
 async def send_deadlines(chat_id: int) -> None:
-    text = await get_message_text()
+    text = get_message_text()
     if text == "Дедлайнов нет)\n\n":
         return
 
@@ -192,7 +161,7 @@ async def send_deadlines(chat_id: int) -> None:
     while dt.datetime.now() - started_updating < dt.timedelta(days=1):
         await asyncio.sleep(60)
         try:
-            new_text = await get_message_text()
+            new_text = get_message_text()
             if text != new_text and new_text != "":
                 await msg.edit_text(new_text, parse_mode="HTML", disable_web_page_preview=True)
                 text = new_text