diff --git a/shvatka/tgbot/handlers/admin.py b/shvatka/tgbot/handlers/admin.py index 7840776d..89bf98c2 100644 --- a/shvatka/tgbot/handlers/admin.py +++ b/shvatka/tgbot/handlers/admin.py @@ -12,11 +12,17 @@ async def merge_teams_command( - message: types.Message, - command: CommandObject, - game_log: GameLogWriter, - dao: HolderDao, + message: types.Message, + command: CommandObject, + game_log: GameLogWriter, + dao: HolderDao, ): + if not command.args: + await message.reply( + "После команды следует указать аргументы. " + "Сначала id команды в новом движке, а потом id команды с форума." + ) + return old_id, new_id = map(int, command.args.split()) primary = await get_team_by_id(new_id, dao.team) assert primary.captain diff --git a/shvatka/tgbot/views/commands.py b/shvatka/tgbot/views/commands.py index 137da7e4..57eec1c6 100644 --- a/shvatka/tgbot/views/commands.py +++ b/shvatka/tgbot/views/commands.py @@ -89,12 +89,14 @@ def __str__(self) -> str: ) -MERGE_TEAMS = BotCommand(command="merge_teams", description="объединить достижения команды в разных источниках") +MERGE_TEAMS = BotCommand( + command="merge_teams", description="объединить достижения команды в разных источниках" +) HELP_GAME_ADMIN = CommandsGroup( "Команды администратора игры", [ MERGE_TEAMS, - ] + ], )