fix: Fixed error with calling commands within active state

This commit is contained in:
ITQ
2024-03-23 02:42:41 +03:00
parent 4f3295a315
commit 675e5ab891
5 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -180,6 +180,7 @@ async def profile_change_entered(message: Message, state: FSMContext) -> None:
successfully=True, successfully=True,
) )
await message.delete()
await delete_message_from_state(state, message.chat.id, message.bot) await delete_message_from_state(state, message.chat.id, message.bot)
state_data = await state.get_data() state_data = await state.get_data()
@@ -220,7 +221,6 @@ async def profile_change_entered(message: Message, state: FSMContext) -> None:
except TelegramBadRequest: except TelegramBadRequest:
pass pass
await message.delete()
await message.answer( await message.answer(
messages.PROFILE_UPDATED, messages.PROFILE_UPDATED,
reply_markup=ReplyKeyboardRemove(), reply_markup=ReplyKeyboardRemove(),
+2 -2
View File
@@ -1,7 +1,7 @@
__all__ = () __all__ = ()
from aiogram import Router from aiogram import Router
from aiogram.filters import Command from aiogram.filters import Command, StateFilter
from aiogram.types import Message from aiogram.types import Message
from app import messages from app import messages
@@ -11,6 +11,6 @@ from app.filters.user import Registered
router = Router(name="help_command") router = Router(name="help_command")
@router.message(Command("help"), Registered()) @router.message(Command("help"), Registered(), StateFilter(None))
async def command_help_handler(message: Message) -> None: async def command_help_handler(message: Message) -> None:
await message.answer(messages.HELP_MESSAGE) await message.answer(messages.HELP_MESSAGE)
+2 -2
View File
@@ -1,7 +1,7 @@
__all__ = () __all__ = ()
from aiogram import Router from aiogram import Router
from aiogram.filters import Command from aiogram.filters import Command, StateFilter
from aiogram.types import Message from aiogram.types import Message
from app import messages from app import messages
@@ -12,6 +12,6 @@ from app.keyboards.menu import get
router = Router(name="menu_command") router = Router(name="menu_command")
@router.message(Command("menu"), Registered()) @router.message(Command("menu"), Registered(), StateFilter(None))
async def command_menu_handler(message: Message) -> None: async def command_menu_handler(message: Message) -> None:
await message.answer(messages.MENU, reply_markup=get()) await message.answer(messages.MENU, reply_markup=get())
+2 -2
View File
@@ -1,7 +1,7 @@
__all__ = () __all__ = ()
from aiogram import Router from aiogram import Router
from aiogram.filters import Command from aiogram.filters import Command, StateFilter
from aiogram.types import Message from aiogram.types import Message
from app import messages from app import messages
@@ -13,7 +13,7 @@ from app.models.user import User
router = Router(name="profile_command") router = Router(name="profile_command")
@router.message(Command("profile"), Registered()) @router.message(Command("profile"), Registered(), StateFilter(None))
async def command_profile_handler(message: Message) -> None: async def command_profile_handler(message: Message) -> None:
if message.from_user is None: if message.from_user is None:
return return
+2 -2
View File
@@ -1,7 +1,7 @@
__all__ = () __all__ = ()
from aiogram import F, Router from aiogram import F, Router
from aiogram.filters import CommandStart from aiogram.filters import CommandStart, StateFilter
from aiogram.fsm.context import FSMContext from aiogram.fsm.context import FSMContext
from aiogram.types import Message, ReplyKeyboardRemove from aiogram.types import Message, ReplyKeyboardRemove
@@ -18,7 +18,7 @@ from app.utils.states import (
router = Router(name="start_command") router = Router(name="start_command")
@router.message(CommandStart()) @router.message(CommandStart(), StateFilter(None))
async def command_start_handler(message: Message, state: FSMContext) -> None: async def command_start_handler(message: Message, state: FSMContext) -> None:
if message.from_user is None: if message.from_user is None:
return return