将InvalidMessage错误合并至UnsupportedMessageOperation

Tian-que · Jul 20, 2022 · 32debe6 · 32debe6
1 parent a7c1e5b
commit 32debe6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/nonebot/adapters/kaiheila/exception.py b/nonebot/adapters/kaiheila/exception.py
@@ -77,15 +77,6 @@ class UnsupportedMessageType(KaiheilaAdapterException):
     pass
 
 
-class InvalidMessage(KaiheilaAdapterException):
-    """
-        :说明:
-
-          在构建/发送不合法的消息类型时抛出，例如 Message 中只有一个图片类型的 MessageSegment 时添加其他 MessageSegment。
-    """
-    pass
-
-
 class UnsupportedMessageOperation(KaiheilaAdapterException):
     """
     :说明:

diff --git a/nonebot/adapters/kaiheila/message.py b/nonebot/adapters/kaiheila/message.py
@@ -6,7 +6,7 @@
 from nonebot.adapters import MessageSegment as BaseMessageSegment
 from nonebot.typing import overrides
 
-from .exception import UnsupportedMessageType, UnsupportedMessageOperation, InvalidMessage
+from .exception import UnsupportedMessageType, UnsupportedMessageOperation
 from .utils import unescape_kmarkdown
 
 msg_type_map = {
@@ -225,7 +225,7 @@ async def serialize(self, for_send: bool = True) -> Tuple[int, str]:
         self.message.reduce()
 
         if len(self.message) != 1:
-            raise InvalidMessage()
+            raise UnsupportedMessageOperation()
 
         msg_type = self.message[0].type
         msg_type_code = msg_type_map[msg_type]