diff --git a/nonebot_plugin_tetris_stats/games/tetrio/bind.py b/nonebot_plugin_tetris_stats/games/tetrio/bind.py index d3ef66a..72d070c 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/bind.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/bind.py @@ -2,7 +2,6 @@ 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 +26,7 @@ command.add( Args( Arg( 'account', - parser(get_player), + 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 73d1d6c..ff062f1 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/config.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/config.py @@ -1,5 +1,4 @@ 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 @@ -19,7 +18,7 @@ command.add( 'config', Option( '--default-template', - Arg('template', parser(Template), notice='模板版本'), + Arg('template', Template, notice='模板版本'), alias=['-DT', 'DefaultTemplate'], help_text='设置默认查询模板', ), diff --git a/nonebot_plugin_tetris_stats/games/tetrio/query.py b/nonebot_plugin_tetris_stats/games/tetrio/query.py index feb34a9..2d85a17 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/query.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/query.py @@ -5,7 +5,6 @@ from typing import TYPE_CHECKING, TypeVar from urllib.parse import urlencode from arclet.alconna import Arg, ArgFlag -from nepattern import parser # type: ignore[import-untyped] from nonebot import get_driver from nonebot.adapters import Event from nonebot.matcher import Matcher @@ -50,20 +49,20 @@ command.add( Args( Arg( 'target', - parser(At | Me), + At | Me, notice='@想要查询的人 / 自己', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ), Arg( 'account', - parser(get_player), + get_player, notice='TETR.IO 用户名 / ID', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ), ), Option( '--template', - Arg('template', parser(Template)), + Arg('template', Template), alias=['-T'], help_text='要使用的查询模板', ), diff --git a/nonebot_plugin_tetris_stats/games/top/__init__.py b/nonebot_plugin_tetris_stats/games/top/__init__.py index 2ce0fe1..806611e 100644 --- a/nonebot_plugin_tetris_stats/games/top/__init__.py +++ b/nonebot_plugin_tetris_stats/games/top/__init__.py @@ -1,5 +1,4 @@ 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 @@ -23,7 +22,7 @@ command.add( Args( Arg( 'account', - parser(get_player), + get_player, notice='TOP 用户名 / ID', flags=[ArgFlag.HIDDEN], ) @@ -35,13 +34,13 @@ command.add( Args( Arg( 'target', - parser(At | Me), + At | Me, notice='@想要查询的人 / 自己', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ), Arg( 'account', - parser(get_player), + 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 cb3903a..14538eb 100644 --- a/nonebot_plugin_tetris_stats/games/tos/__init__.py +++ b/nonebot_plugin_tetris_stats/games/tos/__init__.py @@ -1,5 +1,4 @@ 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 @@ -28,7 +27,7 @@ command.add( Args( Arg( 'account', - parser(get_player), + get_player, notice='茶服 用户名 / ID', flags=[ArgFlag.HIDDEN], ) @@ -40,13 +39,13 @@ command.add( Args( Arg( 'target', - parser(At | Me), + At | Me, notice='@想要查询的人 / 自己', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ), Arg( 'account', - parser(get_player), + get_player, notice='茶服 用户名 / TeaID', flags=[ArgFlag.HIDDEN, ArgFlag.OPTIONAL], ),