From be244f4538e0eecacf2e6ff1902480367c660dc1 Mon Sep 17 00:00:00 2001 From: Artin Date: Thu, 3 Dec 2020 18:47:58 +0800 Subject: [PATCH] :bug: Fix `Message._construct` error --- nonebot/adapters/ding/message.py | 6 +++--- tests/test_plugins/test_permission.py | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nonebot/adapters/ding/message.py b/nonebot/adapters/ding/message.py index 53b83f6e..d8e88314 100644 --- a/nonebot/adapters/ding/message.py +++ b/nonebot/adapters/ding/message.py @@ -45,8 +45,8 @@ class MessageSegment(BaseMessageSegment): self.data["at"]["isAtAll"] = value @staticmethod - def text(text: str) -> "MessageSegment": - return MessageSegment("text", {"text": {"content": text.strip()}}) + def text(text_: str) -> "MessageSegment": + return MessageSegment("text", {"text": {"content": text_.strip()}}) @staticmethod def markdown(title: str, text: str) -> "MessageSegment": @@ -130,4 +130,4 @@ class Message(BaseMessage): elif isinstance(msg, TextMessage): yield MessageSegment("text", {"text": msg.dict()}) elif isinstance(msg, str): - yield MessageSegment.text(str) + yield MessageSegment.text(msg) diff --git a/tests/test_plugins/test_permission.py b/tests/test_plugins/test_permission.py index ed03b80f..23d4e0f5 100644 --- a/tests/test_plugins/test_permission.py +++ b/tests/test_plugins/test_permission.py @@ -2,6 +2,7 @@ from nonebot.rule import to_me from nonebot.typing import Event from nonebot.plugin import on_startswith from nonebot.adapters.cqhttp import Bot +from nonebot.adapters.ding import Bot as DingBot, Event as DingEvent from nonebot.permission import GROUP_ADMIN test_command = on_startswith("hello", to_me(), permission=GROUP_ADMIN) @@ -9,4 +10,9 @@ test_command = on_startswith("hello", to_me(), permission=GROUP_ADMIN) @test_command.handle() async def test_handler(bot: Bot, event: Event, state: dict): - await test_command.finish("hello") + await test_command.finish("cqhttp hello") + + +@test_command.handle() +async def test_handler(bot: DingBot, event: DingEvent, state: dict): + await test_command.finish("ding hello")