Merge remote-tracking branch 'origin/voice-1' into merge-voice-1

helper_bot/handlers/private/private_handlers.py

@@ -18,8 +18,9 @@ from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware
 from helper_bot.utils import messages
 from helper_bot.utils.base_dependency_factory import get_global_instance
 from helper_bot.utils.helper_func import get_first_name, get_text_message, send_text_message, send_photo_message, \
-    send_media_group_message_to_private_chat, prepare_media_group_from_middlewares, check_username_and_full_name, \
-    send_video_message, send_video_note_message, send_audio_message, send_voice_message, add_in_db_media
+    send_media_group_message_to_private_chat, prepare_media_group_from_middlewares, send_video_message, \
+    send_video_note_message, send_audio_message, send_voice_message, add_in_db_media, \
+    update_user_info, check_user_emoji
 from logs.custom_logger import logger
 
 private_router = Router()
@@ -42,6 +43,35 @@ BotDB = bdf.get_db()
 # Expose sleep for tests (tests patch helper_bot.handlers.private.private_handlers.sleep)
 sleep = asyncio.sleep
 
+@private_router.message(
+    ChatTypeFilter(chat_type=["private"]),
+    Command("emoji")
+)
+async def handle_emoji_message(message: types.Message, state: FSMContext):
+    await message.forward(chat_id=GROUP_FOR_LOGS)
+    user_emoji = check_user_emoji(message)
+    await state.set_state("START")
+    if user_emoji is not None:
+        await message.answer(f'Твоя эмодзя - {user_emoji}', parse_mode='HTML')
+
+
+@private_router.message(
+    ChatTypeFilter(chat_type=["private"]),
+    Command("restart")
+)
+async def handle_restart_message(message: types.Message, state: FSMContext):
+    try:
+        markup = get_reply_keyboard(BotDB, message.from_user.id)
+        await message.forward(chat_id=GROUP_FOR_LOGS)
+        await state.set_state("START")
+        await update_user_info('love', message)
+        check_user_emoji(message)
+        await message.answer('Я перезапущен!', reply_markup=markup, parse_mode='HTML')
+    except Exception as e:
+        logger.error(f"Произошла ошибка handle_restart_message. Ошибка:{str(e)}")
+        await message.bot.send_message(chat_id=IMPORTANT_LOGS,
+                                       text=f"Произошла ошибка handle_restart_message: {str(e)}\n\nTraceback:\n{traceback.format_exc()}")
+
 
 @private_router.message(
     ChatTypeFilter(chat_type=["private"]),
@@ -60,6 +90,8 @@ async def handle_start_message(message: types.Message, state: FSMContext):
         is_bot = message.from_user.is_bot
         language_code = message.from_user.language_code
         user_id = message.from_user.id
+        await update_user_info('love', message)
+        check_user_emoji(message)
         
         # Проверяем наличие username для логирования
         if not username: