Update

tgbot/routers/admin/admin_menu.py

@@ -1,6 +1,6 @@
 # - *- coding: utf- 8 - *-
-from aiogram import Router, Bot
-from aiogram.filters import Text, Command
+from aiogram import Router, Bot, F
+from aiogram.filters import Command
 from aiogram.types import FSInputFile, Message, CallbackQuery
 
 from tgbot.data.config import PATH_DATABASE, PATH_LOGS
@@ -13,7 +13,7 @@ router = Router()
 
 
 # Кнопка - Admin Inline
-@router.message(Text(text="Admin Inline"))
+@router.message(F.text == 'Admin Inline')
 async def admin_button_inline(message: Message, bot: Bot, state: FSM, rSession: RS, my_user):
     await state.clear()
 
@@ -21,7 +21,7 @@ async def admin_button_inline(message: Message, bot: Bot, state: FSM, rSession:
 
 
 # Кнопка - Admin Reply
-@router.message(Text(text="Admin Reply"))
+@router.message(F.text == 'Admin Reply')
 async def admin_button_reply(message: Message, bot: Bot, state: FSM, rSession: RS, my_user):
     await state.clear()
 
@@ -29,13 +29,13 @@ async def admin_button_reply(message: Message, bot: Bot, state: FSM, rSession: R
 
 
 # Колбэк - Admin X
-@router.callback_query(Text(text="admin_inline_x"))
+@router.callback_query(F.data == 'admin_inline_x')
 async def admin_callback_inline_x(call: CallbackQuery, bot: Bot, state: FSM, rSession: RS, my_user):
     await call.answer(f"Click Admin X")
 
 
 # Колбэк - Admin
-@router.callback_query(Text(startswith="admin_inline:"))
+@router.callback_query(F.data.startswith('admin_inline:'))
 async def admin_callback_inline(call: CallbackQuery, bot: Bot, state: FSM, rSession: RS, my_user):
     get_data = call.data.split(":")[1]
 

tgbot/routers/main_missed.py

@@ -1,22 +1,21 @@
 # - *- coding: utf- 8 - *-
-from aiogram import Router, Bot
-from aiogram.filters import Text
+from aiogram import Router, Bot, F
 from aiogram.types import CallbackQuery, Message
 
-from tgbot.keyboards.reply_main import menu_frep
+from tgbot.utils.const_functions import del_message
 from tgbot.utils.misc.bot_models import FSM, RS
 
 router = Router()
 
 
 # Колбэк с удалением сообщения
-@router.callback_query(Text(text="close_this"))
+@router.callback_query(F.data == 'close_this')
 async def main_callback_close(call: CallbackQuery, bot: Bot, state: FSM, rSession: RS, my_user):
-    await call.message.delete()
+    await del_message(call.message)
 
 
 # Колбэк с обработкой кнопки
-@router.callback_query(Text(text="..."))
+@router.callback_query(F.data == '...')
 async def main_callback_answer(call: CallbackQuery, bot: Bot, state: FSM, rSession: RS, my_user):
     await call.answer(cache_time=30)
 
@@ -24,20 +23,13 @@ async def main_callback_answer(call: CallbackQuery, bot: Bot, state: FSM, rSessi
 # Колбэк с обработкой удаления сообщений потерявших стейт
 @router.callback_query()
 async def main_callback_missed(call: CallbackQuery, bot: Bot, state: FSM, rSession: RS, my_user):
-    try:
-        await call.message.delete()
-    except:
-        pass
-
-    await call.message.answer(
-        "❌ Данные не были найдены из-за перезапуска скрипта.\n"
-        "♻ Выполните действие заново.",
-        reply_markup=menu_frep(call.from_user.id),
-    )
+    await call.answer(f"❗️ Miss callback: {call.data}", True)
 
 
 # Обработка всех неизвестных команд
 @router.message()
 async def main_message_missed(message: Message, bot: Bot, state: FSM, rSession: RS, my_user):
-    await message.answer("♦ Неизвестная команда.\n"
-                         "♦ Введите /start")
+    await message.answer(
+        "♦️ Unknown command.\n"
+        "♦️ Enter /start",
+    )

tgbot/routers/main_start.py

@@ -1,6 +1,6 @@
 # - *- coding: utf- 8 - *-
-from aiogram import Router, Bot
-from aiogram.filters import Text, Command
+from aiogram import Router, Bot, F
+from aiogram.filters import Command
 from aiogram.types import Message
 
 from tgbot.keyboards.reply_main import menu_frep
@@ -11,16 +11,15 @@ router = Router()
 
 
 # Открытие главного меню
-@router.message(Text(text=['🔙 Главное меню']))
+@router.message(F.text.in_(('🔙 Main menu', '🔙 Return')))
 @router.message(Command(commands=['start']))
 async def main_start(message: Message, bot: Bot, state: FSM, rSession: RS, my_user):
     await state.clear()
 
     await message.answer(
-        ded("""
-        🔸 Бот готов к использованию.
-        🔸 Если не появились вспомогательные кнопки
-        🔸 Введите /start
+        ded(f"""
+            🔸 Hello, {my_user['user_name']}
+            🔸 Enter /start or /inline
         """),
         reply_markup=menu_frep(message.from_user.id),
     )

tgbot/routers/user/user_menu.py

@@ -1,6 +1,6 @@
 # - *- coding: utf- 8 - *-
-from aiogram import Router, Bot
-from aiogram.filters import Command, Text
+from aiogram import Router, Bot, F
+from aiogram.filters import Command
 from aiogram.types import Message, CallbackQuery
 
 from tgbot.keyboards.inline_main import menu_finl
@@ -12,19 +12,25 @@ router = Router()
 
 
 # Кнопка - User Inline
-@router.message(Text(text="User Inline"))
+@router.message(F.text == 'User Inline')
 async def user_button_inline(message: Message, bot: Bot, state: FSM, rSession: RS, my_user):
     await state.clear()
 
-    await message.answer("Click Button - User Inline", reply_markup=user_inl)
+    await message.answer(
+        "Click Button - User Inline",
+        reply_markup=user_inl,
+    )
 
 
 # Кнопка - User Reply
-@router.message(Text(text="User Reply"))
+@router.message(F.text == 'User Reply')
 async def user_button_reply(message: Message, bot: Bot, state: FSM, rSession: RS, my_user):
     await state.clear()
 
-    await message.answer("Click Button - User Reply", reply_markup=user_rep)
+    await message.answer(
+        "Click Button - User Reply",
+        reply_markup=user_rep,
+    )
 
 
 # Команда - /inline
@@ -32,17 +38,20 @@ async def user_button_reply(message: Message, bot: Bot, state: FSM, rSession: RS
 async def user_command_inline(message: Message, bot: Bot, state: FSM, rSession: RS, my_user):
     await state.clear()
 
-    await message.answer("Click command - /inline", reply_markup=menu_finl(message.from_user.id))
+    await message.answer(
+        "Click command - /inline",
+        reply_markup=menu_finl(message.from_user.id),
+    )
 
 
 # Колбэк - User X
-@router.callback_query(Text(text="user_inline_x"))
+@router.callback_query(F.data == 'user_inline_x')
 async def user_callback_inline_x(call: CallbackQuery, bot: Bot, state: FSM, rSession: RS, my_user):
     await call.answer(f"Click User X")
 
 
 # Колбэк - User
-@router.callback_query(Text(startswith="user_inline:"))
+@router.callback_query(F.data.startswith('user_inline:'))
 async def user_callback_inline(call: CallbackQuery, bot: Bot, state: FSM, rSession: RS, my_user):
     get_data = call.data.split(":")[1]