diff --git a/konabot/plugins/nya_echo/__init__.py b/konabot/plugins/nya_echo/__init__.py index b92471d..54251bc 100644 --- a/konabot/plugins/nya_echo/__init__.py +++ b/konabot/plugins/nya_echo/__init__.py @@ -4,11 +4,11 @@ from nonebot_plugin_alconna import UniMessage, UniMsg, Text from konabot.common.nb.match_keyword import match_keyword -evt = on_message(rule=match_keyword("喵")) +evt_nya_v2 = on_message(rule=match_keyword("喵")) -@evt.handle() +@evt_nya_v2.handle() async def _(): - await evt.send(await UniMessage().text("喵").export()) + await evt_nya_v2.send(await UniMessage().text("喵").export()) NYA_SYMBOL_MAPPING = { @@ -34,18 +34,22 @@ async def has_nya(msg: UniMsg) -> bool: return False text = msg.extract_plain_text() - if any(((char not in NYA_SYMBOL_MAPPING) for char in text)): - return False if len(text) <= 1: return False + if "喵" not in text: + return False + + if any(((char not in NYA_SYMBOL_MAPPING) for char in text)): + return False + return True -evt = on_message(rule=has_nya) +evt_nya_v2 = on_message(rule=has_nya) -@evt.handle() +@evt_nya_v2.handle() async def _(msg: UniMsg, evt: Event): text = msg.extract_plain_text() await UniMessage.text(''.join(