🔀 Merge pull request #255

Fix: prompt type error

docs/api/adapters/README.md

@@ -179,7 +179,7 @@ await bot.send_msg(message="hello world")
 
 ## _class_ `MessageSegment`
 
-基类：`abc.ABC`
+基类：`abc.ABC`, `Mapping`
 
 消息段基类
 

docs/api/adapters/cqhttp.md

@@ -307,7 +307,7 @@ CQHTTP 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。
 
 ## _class_ `MessageSegment`
 
-基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)
+基类：`abc.ABC`, `Mapping`
 
 CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。
 

docs/api/adapters/ding.md

@@ -199,7 +199,7 @@ sidebarDepth: 0
 
 ## _class_ `MessageSegment`
 
-基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)
+基类：`abc.ABC`, `Mapping`
 
 钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。
 

docs/api/adapters/mirai.md

@@ -722,7 +722,7 @@ mirai-api-http 正向 Websocket 协议 Bot 适配。
 
 ## _class_ `MessageSegment`
 
-基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)
+基类：`abc.ABC`, `Mapping`
 
 Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md)
 

nonebot/adapters/_base.py

@@ -152,7 +152,7 @@ T_MessageSegment = TypeVar("T_MessageSegment", bound="MessageSegment")
 
 
 @dataclass
-class MessageSegment(abc.ABC):
+class MessageSegment(abc.ABC, Mapping):
     """消息段基类"""
     type: str
     """
@@ -166,10 +166,16 @@ class MessageSegment(abc.ABC):
     """
 
     @abc.abstractmethod
-    def __str__(self: T_MessageSegment) -> str:
+    def __str__(self) -> str:
         """该消息段所代表的 str，在命令匹配部分使用"""
         raise NotImplementedError
 
+    def __len__(self) -> int:
+        return len(str(self))
+
+    def __ne__(self: T_MessageSegment, other: T_MessageSegment) -> bool:
+        return not self == other
+
     @abc.abstractmethod
     def __add__(self: T_MessageSegment, other: Union[str, T_MessageSegment,
                                                      T_Message]) -> T_Message:
@@ -203,9 +209,24 @@ class MessageSegment(abc.ABC):
     def __setitem__(self, key, value):
         return setattr(self, key, value)
 
-    def get(self, key, default=None):
+    def __iter__(self):
+        yield from self.data.__iter__()
+
+    def __contains__(self, key: object) -> bool:
+        return key in self.data
+
+    def get(self, key: str, default=None):
         return getattr(self, key, default)
 
+    def keys(self):
+        return self.data.keys()
+
+    def values(self):
+        return self.data.values()
+
+    def items(self):
+        return self.data.items()
+
     def copy(self: T_MessageSegment) -> T_MessageSegment:
         return copy(self)
 

nonebot/matcher.py

@@ -10,7 +10,7 @@ from functools import wraps
 from datetime import datetime
 from contextvars import ContextVar
 from collections import defaultdict
-from typing import Type, List, Dict, Union, Callable, Optional, NoReturn, TYPE_CHECKING
+from typing import Type, List, Dict, Union, Mapping, Iterable, Callable, Optional, NoReturn, TYPE_CHECKING
 
 from nonebot.rule import Rule
 from nonebot.log import logger
@@ -345,8 +345,23 @@ class Matcher(metaclass=MatcherMeta):
             state["_current_key"] = key
             if key not in state:
                 if prompt:
-                    await bot.send(event=event,
+                    if isinstance(prompt, str):
-                                   message=str(prompt).format(**state))
+                        await bot.send(event=event,
+                                       message=prompt.format(**state))
+                    elif isinstance(prompt, Mapping):
+                        if prompt.is_text():
+                            await bot.send(event=event,
+                                           message=str(prompt).format(**state))
+                        else:
+                            await bot.send(event=event, message=prompt)
+                    elif isinstance(prompt, Iterable):
+                        await bot.send(
+                            event=event,
+                            message=prompt.__class__(
+                                str(prompt).format(**state))  # type: ignore
+                        )
+                    else:
+                        logger.warning("Unknown prompt type, ignored.")
                 raise PausedException
             else:
                 state["_skip_key"] = True