Update

tgbot/routers/user/user_menu.py

@@ -3,55 +3,43 @@ from aiogram import Router, Bot, F
 from aiogram.filters import Command
 from aiogram.types import Message, CallbackQuery
 
-from tgbot.database.db_users import UserModel
-from tgbot.keyboards.inline_main import menu_finl
-from tgbot.keyboards.inline_misc import user_inl
-from tgbot.keyboards.reply_misc import user_rep
+from tgbot.database.db_users import BaseModel as UserModel
+from tgbot.keyboards.inline_main import user_finl
+from tgbot.keyboards.reply_main import menu_frep
 from tgbot.utils.misc.bot_models import FSM, ARS
 
 router = Router(name=__name__)
 
 
-# Кнопка - User Inline
-@router.message(F.text == 'User Inline')
+# Message - User button
+@router.message(F.text == 'User button')
 async def user_button_inline(message: Message, bot: Bot, state: FSM, arSession: ARS, User: UserModel):
     await state.clear()
 
     await message.answer(
-        "Click Button - User Inline",
-        reply_markup=user_inl,
+        "Inline user keyboards",
+        reply_markup=user_finl()
     )
 
 
-# Кнопка - User Reply
-@router.message(F.text == 'User Reply')
-async def user_button_reply(message: Message, bot: Bot, state: FSM, arSession: ARS, User: UserModel):
+# Command - /menu
+@router.message(Command(commands="menu"))
+async def user_command_menu(message: Message, bot: Bot, state: FSM, arSession: ARS, User: UserModel):
     await state.clear()
 
     await message.answer(
-        "Click Button - User Reply",
-        reply_markup=user_rep,
+        "Enter command - /menu",
+        reply_markup=menu_frep(message.from_user.id),
     )
 
 
-# Команда - /inline
-@router.message(Command(commands="inline"))
-async def user_command_inline(message: Message, bot: Bot, state: FSM, arSession: ARS, User: UserModel):
-    await state.clear()
-
-    await message.answer(
-        "Click command - /inline",
-        reply_markup=menu_finl(message.from_user.id),
-    )
-
-
-# Колбэк - User X
+# Callback - User X
 @router.callback_query(F.data == 'user_inline_x')
 async def user_callback_inline_x(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS, User: UserModel):
     await call.answer(f"Click User X")
 
 
-# Колбэк - User
+# Callback - User
 @router.callback_query(F.data.startswith('user_inline:'))
 async def user_callback_inline(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS, User: UserModel):
     get_data = call.data.split(":")[1]