first com2

handlers/menus.py

@@ -1,11 +1,12 @@
-from aiogram import Router
-from aiogram.filters import CommandStart, CommandObject
-from aiogram.types import Message
+from aiogram import Router, F
+from aiogram.filters import CommandStart, CommandObject, Command
+from aiogram.types import CallbackQuery, Message
 from aiogram.fsm.context import FSMContext
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from dto.di import DependenciesDTO
 from keyboards.client import main_menu
+from texts import build_main_menu_text
 
 router = Router()
 
@@ -28,19 +29,26 @@ async def fetch_referal(
     referal = data[0]
     await deps.user_service.add_user(session, user_id=msg.from_user.id, referal=referal)
 
-    await msg.reply(f"hi but....{referal}", reply_markup=main_menu)
+    await msg.reply(build_main_menu_text(), reply_markup=main_menu)
 
 
-@router.message(CommandStart(deep_link=False))
-async def standard_start(msg: Message, command: CommandObject, state: FSMContext):
-    await msg.reply("hii!", reply_markup=main_menu)
+@router.message(Command(commands=["start", "cancel"]))
+async def standard_start(
+    msg: Message,
+    command: CommandObject,
+    state: FSMContext,
+    session: AsyncSession,
+    deps: DependenciesDTO,
+):
+    await state.clear()
+
+    await deps.user_service.add_user(session, user_id=msg.from_user.id)
+
+    await msg.reply(build_main_menu_text(), reply_markup=main_menu)
 
 
-# INSANE HOW UNSTABLE THIS FUCKING SYSTEM IS
-# EVEN AFTER ROLLING EVERYTHING BACK
-# HALF OF MY APPS STILL DONT WORK
-# I FUCKING HATE THIS SHIT
-# I CANT PACMAN -SYU CUZ IT BREAKS NVIDIA DRIVERS AND MY 240HZ MONITOR
-# IS IN FUCKING 3 FPS **CONSTANTLY**
-# I CANT MAKE IT UP AND I REALLY CANT  TAE IT ANYMORE.
-# wrap it up bud. we're gonna reset everything. bye. o7
+@router.callback_query(F.data == "menu:main")
+async def main_menu_cb(cb: CallbackQuery, state: FSMContext):
+    await state.clear()
+
+    await cb.message.edit_text(build_main_menu_text(), reply_markup=main_menu)