From 28ead944c0092ff1838946efd753d09354fc5ccc Mon Sep 17 00:00:00 2001 From: bomzheg Date: Fri, 23 Aug 2024 23:36:09 +0300 Subject: [PATCH] fixed not implemented commands --- shvatka/tgbot/dialogs/starters/editor.py | 12 +++++++++++- shvatka/tgbot/views/commands.py | 10 ++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/shvatka/tgbot/dialogs/starters/editor.py b/shvatka/tgbot/dialogs/starters/editor.py index 55130932..6224d6c5 100644 --- a/shvatka/tgbot/dialogs/starters/editor.py +++ b/shvatka/tgbot/dialogs/starters/editor.py @@ -6,7 +6,12 @@ from shvatka.tgbot import states from shvatka.tgbot.filters.can_be_author import can_be_author from shvatka.tgbot.utils.router import register_start_handler -from shvatka.tgbot.views.commands import MY_GAMES_COMMAND, NEW_LEVEL_COMMAND, NEW_GAME_COMMAND +from shvatka.tgbot.views.commands import ( + MY_GAMES_COMMAND, + NEW_LEVEL_COMMAND, + NEW_GAME_COMMAND, + LEVELS_COMMAND, +) logger = logging.getLogger(__name__) @@ -26,6 +31,11 @@ def setup() -> Router: state=states.LevelSG.level_id, router=router, ) + register_start_handler( + Command(commands=LEVELS_COMMAND), + state=states.LevelListSG.levels, + router=router, + ) register_start_handler( Command(commands=NEW_GAME_COMMAND), state=states.GameWriteSG.game_name, diff --git a/shvatka/tgbot/views/commands.py b/shvatka/tgbot/views/commands.py index a7223def..85459125 100644 --- a/shvatka/tgbot/views/commands.py +++ b/shvatka/tgbot/views/commands.py @@ -15,7 +15,7 @@ def __str__(self) -> str: START_COMMAND = BotCommand(command="start", description="начало работы с ботом") -HELP_COMMAND = BotCommand(command="help", description="помощь") # TODO +HELP_COMMAND = BotCommand(command="help", description="помощь") ABOUT_COMMAND = BotCommand(command="about", description="о боте") CANCEL_COMMAND = BotCommand(command="cancel", description="отмена начатого диалога") CHAT_ID_COMMAND = BotCommand(command="chat_id", description="узнать chat_id данного чата") @@ -43,9 +43,6 @@ def __str__(self) -> str: MANAGE_TEAM_COMMAND = BotCommand( command="manage_team", description="открыть меню управления командой" ) -REMOVE_FROM_TEAM_COMMAND = BotCommand( - command="remove_from_team", description="удалить игрока из команды (реплаем по игроку)" -) # TODO START_WAIVERS_COMMAND = BotCommand(command="waivers", description="начать сборку вейверов") APPROVE_WAIVERS_COMMAND = BotCommand( command="approve_waivers", description="закрыть сборку вейверов" @@ -57,7 +54,6 @@ def __str__(self) -> str: CREATE_TEAM_COMMAND, ADD_IN_TEAM_COMMAND, MANAGE_TEAM_COMMAND, - REMOVE_FROM_TEAM_COMMAND, START_WAIVERS_COMMAND, APPROVE_WAIVERS_COMMAND, ], @@ -69,7 +65,7 @@ def __str__(self) -> str: NEW_GAME_COMMAND = BotCommand( command="new_game", description="начать сборку новой игры из ранее написанных уровней" ) -LEVELS_COMMAND = BotCommand(command="levels", description="показать список уровней") # TODO +LEVELS_COMMAND = BotCommand(command="levels", description="показать список уровней") GET_WAIVERS_COMMAND = BotCommand(command="get_waivers", description="показать текущие вейверы") SPY_COMMAND = BotCommand(command="spy", description="Меню шпиона - организатора") SPY_LEVELS_COMMAND = BotCommand( @@ -96,7 +92,6 @@ def __str__(self) -> str: ) -STATUS_COMMAND = BotCommand(command="status", description="статус схватки") # TODO TEAM_COMMAND = BotCommand(command="team", description="команда") TEAMS_COMMAND = BotCommand(command="teams", description="список команд") PLAYERS_COMMAND = BotCommand(command="players", description="игроки команды") @@ -107,7 +102,6 @@ def __str__(self) -> str: HELP_INFO = CommandsGroup( "Другие команды:", [ - STATUS_COMMAND, TEAM_COMMAND, TEAMS_COMMAND, PLAYERS_COMMAND,