Refactor module imports to ensure project root is included in sys.path for both run_helper and voice_bot. Enhance database user insertion with backward compatibility for emoji column. Update user info handling to check username and full name more robustly. Improve emoji handling with fallback options for environments lacking the emoji package.

helper_bot/utils/helper_func.py

@@ -4,16 +4,28 @@ import random
 from datetime import datetime, timedelta
 from time import sleep
 
-import emoji
+try:
+    import emoji as _emoji_lib
+except Exception:
+    _emoji_lib = None
 from aiogram import types
 from aiogram.types import InputMediaPhoto, FSInputFile, InputMediaVideo, InputMediaAudio
 
-from helper_bot.utils.base_dependency_factory import BaseDependencyFactory
+from helper_bot.utils.base_dependency_factory import BaseDependencyFactory, get_global_instance
 from logs.custom_logger import logger
 
+bdf = get_global_instance()
+BotDB = bdf.get_db()
 GROUP_FOR_LOGS = bdf.settings['Telegram']['group_for_logs']
 
-emoji_list = list(emoji.EMOJI_DATA.keys())
+if _emoji_lib is not None:
+    emoji_list = list(_emoji_lib.EMOJI_DATA.keys())
+else:
+    # Fallback minimal emoji set for environments without the 'emoji' package (e.g., CI tests)
+    emoji_list = [
+        "🙂", "😀", "😉", "😎", "🤖", "🦄", "🐱", "🐶", "🍀", "🔥",
+        "🌟", "🎉", "💡", "🚀", "🌈"
+    ]
 
 
 def safe_html_escape(text: str) -> str:
@@ -484,7 +496,7 @@ async def update_user_info(source: str, message: types.Message):
         BotDB.add_new_user_in_db(user_id, first_name, full_name, username, is_bot, language_code, user_emoji, date,
                                  date)
     else:
-        is_need_update = check_username_and_full_name(user_id, username, full_name)
+        is_need_update = check_username_and_full_name(user_id, username, full_name, BotDB)
         if is_need_update:
             BotDB.update_username_and_full_name(user_id, username, full_name)
             if source != 'voice':
@@ -499,7 +511,7 @@ async def update_user_info(source: str, message: types.Message):
 def check_user_emoji(message: types.Message):
     user_id = message.from_user.id
     user_emoji = BotDB.check_emoji_for_user(user_id=user_id)
-    if user_emoji is None:
+    if user_emoji is None or user_emoji in ("Смайл еще не определен", "Эмоджи не определен", ""):
         user_emoji = get_random_emoji()
         BotDB.update_emoji_for_user(user_id=user_id, emoji=user_emoji)
     return user_emoji