diff --git a/nonebot/adapters/cqhttp.py b/nonebot/adapters/cqhttp.py index ecb15daa..33aee948 100644 --- a/nonebot/adapters/cqhttp.py +++ b/nonebot/adapters/cqhttp.py @@ -182,13 +182,13 @@ def _check_nickname(bot: "Bot", event: "Event"): first_text = first_msg_seg.data["text"] - if bot.config.NICKNAME: + if bot.config.nickname: # check if the user is calling me with my nickname - if isinstance(bot.config.NICKNAME, str) or \ - not isinstance(bot.config.NICKNAME, Iterable): - nicknames = (bot.config.NICKNAME,) + if isinstance(bot.config.nickname, str) or \ + not isinstance(bot.config.nickname, Iterable): + nicknames = (bot.config.nickname,) else: - nicknames = filter(lambda n: n, bot.config.NICKNAME) + nicknames = filter(lambda n: n, bot.config.nickname) nickname_regex = "|".join(nicknames) m = re.search(rf"^({nickname_regex})([\s,,]*|$)", first_text, re.IGNORECASE) diff --git a/nonebot/config.py b/nonebot/config.py index 1680f40c..70b8e3cb 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -211,10 +211,10 @@ class Config(BaseConfig): SUPER_USERS=[12345789] """ - nickname: Union[str, Set[str]] = "" + nickname: Set[str] = set() """ - - 类型: ``Union[str, Set[str]]`` - - 默认值: ``""`` + - 类型: ``Set[str]`` + - 默认值: ``set()`` - 说明: 机器人昵称。 """ diff --git a/tests/.env.dev b/tests/.env.dev index 9e330159..96101fd4 100644 --- a/tests/.env.dev +++ b/tests/.env.dev @@ -4,6 +4,7 @@ PORT=2333 DEBUG=true SUPERUSERS=[123123123] +NICKNAME=["bot"] COMMAND_START=["", "/", "#"] COMMAND_SEP=["/", "."]