This commit is contained in:
dj
2023-12-01 18:17:58 +03:00
parent e0fe8e392f
commit 2208bbf566
18 changed files with 353 additions and 190 deletions
+4 -3
View File
@@ -3,9 +3,10 @@ from aiogram import Router, Bot, F
from aiogram.filters import Command
from aiogram.types import Message
from tgbot.database.db_users import UserModel
from tgbot.keyboards.reply_main import menu_frep
from tgbot.utils.const_functions import ded
from tgbot.utils.misc.bot_models import FSM, RS
from tgbot.utils.misc.bot_models import FSM, ARS
router = Router(name=__name__)
@@ -13,12 +14,12 @@ router = Router(name=__name__)
# Открытие главного меню
@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):
async def main_start(message: Message, bot: Bot, state: FSM, arSession: ARS, User: UserModel):
await state.clear()
await message.answer(
ded(f"""
🔸 Hello, {my_user['user_name']}
🔸 Hello, {User.user_name}
🔸 Enter /start or /inline
"""),
reply_markup=menu_frep(message.from_user.id),