diff --git a/nonebot_plugin_tetris_stats/games/tetrio/bind.py b/nonebot_plugin_tetris_stats/games/tetrio/bind.py index 19edb13..ee692a8 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/bind.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/bind.py @@ -3,6 +3,7 @@ from hashlib import md5 from urllib.parse import urlencode from arclet.alconna import Arg, ArgFlag +from nepattern import parser # type: ignore[import-untyped] from nonebot_plugin_alconna import Args, Subcommand from nonebot_plugin_alconna.uniseg import UniMessage from nonebot_plugin_orm import get_session @@ -27,7 +28,7 @@ command.add( Args( Arg( 'account', - get_player, + parser(get_player), notice='TETR.IO 用户名 / ID', flags=[ArgFlag.HIDDEN], ) diff --git a/nonebot_plugin_tetris_stats/games/tetrio/config.py b/nonebot_plugin_tetris_stats/games/tetrio/config.py index 215ca01..1ad1ecc 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/config.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/config.py @@ -1,4 +1,5 @@ from arclet.alconna import Arg +from nepattern import parser # type: ignore[import-untyped] from nonebot_plugin_alconna import Option, Subcommand from nonebot_plugin_alconna.uniseg import UniMessage from nonebot_plugin_orm import async_scoped_session @@ -18,7 +19,7 @@ command.add( 'config', Option( '--default-template', - Arg('template', Template, notice='模板版本'), + Arg('template', parser(Template), notice='模板版本'), alias=['-DT', 'DefaultTemplate'], help_text='设置默认查询模板', ), diff --git a/nonebot_plugin_tetris_stats/games/top/__init__.py b/nonebot_plugin_tetris_stats/games/top/__init__.py index 72439b2..2ce0fe1 100644 --- a/nonebot_plugin_tetris_stats/games/top/__init__.py +++ b/nonebot_plugin_tetris_stats/games/top/__init__.py @@ -1,5 +1,6 @@ -from arclet.alconna import Arg, ArgFlag, Args, Subcommand -from nonebot_plugin_alconna import At +from arclet.alconna import Arg, ArgFlag +from nepattern import parser # type: ignore[import-untyped] +from nonebot_plugin_alconna import Args, At, Subcommand from ...utils.exception import MessageFormatError from ...utils.typing import Me @@ -22,7 +23,7 @@ command.add( Args( Arg( 'account', - get_player, + parser(get_player), notice='TOP 用户名 / ID', flags=[ArgFlag.HIDDEN], ) @@ -34,13 +35,13 @@ command.add( Args( Arg( 'target', - At | Me, + parser(At | Me), notice='@想要查询的人 / 自己', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ), Arg( 'account', - get_player, + parser(get_player), notice='TOP 用户名', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ), diff --git a/nonebot_plugin_tetris_stats/games/tos/__init__.py b/nonebot_plugin_tetris_stats/games/tos/__init__.py index f986da8..cb3903a 100644 --- a/nonebot_plugin_tetris_stats/games/tos/__init__.py +++ b/nonebot_plugin_tetris_stats/games/tos/__init__.py @@ -1,5 +1,6 @@ -from arclet.alconna import Arg, ArgFlag, Args, Subcommand -from nonebot_plugin_alconna import At +from arclet.alconna import Arg, ArgFlag +from nepattern import parser # type: ignore[import-untyped] +from nonebot_plugin_alconna import Args, At, Subcommand from ...utils.exception import MessageFormatError from ...utils.typing import Me @@ -27,7 +28,7 @@ command.add( Args( Arg( 'account', - get_player, + parser(get_player), notice='茶服 用户名 / ID', flags=[ArgFlag.HIDDEN], ) @@ -39,13 +40,13 @@ command.add( Args( Arg( 'target', - At | Me, + parser(At | Me), notice='@想要查询的人 / 自己', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ), Arg( 'account', - get_player, + parser(get_player), notice='茶服 用户名 / TeaID', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ),