upd

commands.py

@@ -34,12 +34,10 @@ from actions import (
   get_server_ip
 )
 from utils import (
-  WORDS_TABLE,
   make_temporary_filename,
   make_cache_filename,
   parse_kind,
   get_user_name,
-  get_word_for,
   calculate_age,
   unparse
 )
@@ -356,14 +354,7 @@ async def bday_handler(bot, event, command):
       except ValueError:
         continue
 
-    birthdays_list += get_user_name(entity)
-    birthdays_list += ' — '
-    birthdays_list += age.date_string
-
-    if age.days_until < 1:
-      birthdays_list += f' (сегодня исполняется {get_word_for("год", age.age)})\n'
-    else:
-      birthdays_list += f' (через {get_word_for("день", age.days_until)} исполнится {get_word_for("год", age.age)}; сейчас {get_word_for("год", age.age_now)})\n'
+    birthdays_list += f'{get_user_name(entity)} ❯ {age.age_now} ➔ {age.age} ❯ {age.date_string} ❯ {age.days_until}\n'
 
   await event.reply(f'Дни рождения:\n\n{birthdays_list}')
 

utils.py

@@ -37,16 +37,6 @@ class Kind(IntEnum):
   NO_TARGET            = 2
   NO_TARGET_MAYBE      = 3
 
-class WordKind(IntEnum):
-  FIRST  = 0 # «год» / «день».
-  SECOND = 1 # «лет» / «дней».
-  THIRD  = 2 # «года» / «дня».
-
-WORDS_TABLE = {
- 'год': ('год', 'лет', 'года'),
- 'день': ('день', 'дней', 'дня')
-}
-
 def parse_command(text):
   text = text.strip()
 
@@ -117,30 +107,6 @@ def parse_kind(kind):
 
   return kind
 
-# Bruh?
-def get_word_kind(number):
-  if number >= 100:
-    number %= 100
-
-  if number == 0 or 5 <= number <= 20:
-    return WordKind.SECOND
-
-  last_digit = number % 10
-
-  if last_digit == 0:
-    return WordKind.SECOND
-
-  if last_digit == 1:
-    return WordKind.FIRST
-
-  if 5 <= last_digit <= 9:
-    return WordKind.SECOND
-
-  return WordKind.THIRD
-
-def get_word_for(word, number):
-  return f'{number} {WORDS_TABLE[word][get_word_kind(number)]}'
-
 def calculate_age(date):
   now = datetime.now().date()
   birthday_date = date.replace(year=now.year)