From ac36361a0753cfbf08a8ecfecf32586192541361 Mon Sep 17 00:00:00 2001 From: XYCode Kerman Date: Fri, 21 Jun 2024 23:52:33 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 消息组件和GetStatus接口 --- mirai_onebot/api/interfaces/meta.py | 10 +++++++--- mirai_onebot/message/message_components.py | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/mirai_onebot/api/interfaces/meta.py b/mirai_onebot/api/interfaces/meta.py index 6d59457..aaab55f 100644 --- a/mirai_onebot/api/interfaces/meta.py +++ b/mirai_onebot/api/interfaces/meta.py @@ -2,8 +2,8 @@ from pydantic import BaseModel -from mirai_onebot.api.interfaces.base import (BotSelf, Request, Response, - ResponseData) +from mirai_onebot.api.interfaces.base import (BotSelf, Request, RequestParams, + Response, ResponseData) # ========== GetStatus ========== @@ -17,9 +17,13 @@ class GetStatusResponseData(ResponseData): bots: List[BotStatus] +class GetStatusRequestParams(RequestParams): + pass + + class GetStatusRequest(Request): action: str = 'get_status' - params: dict = {} + params: GetStatusRequestParams = GetStatusRequestParams() class GetStatusResponse(Response): diff --git a/mirai_onebot/message/message_components.py b/mirai_onebot/message/message_components.py index bf07af0..4364554 100644 --- a/mirai_onebot/message/message_components.py +++ b/mirai_onebot/message/message_components.py @@ -21,7 +21,7 @@ def to_dict(self) -> Dict[str, Any]: } @staticmethod - def load_from_dict(data: dict) -> Union[Text, Mention, MentionAll, Image, Voice, Audio, Video, File, Location, Reply]: + def load_from_dict(data: dict) -> MessageComponentsType: """从字典加载为消息组件 Examples: @@ -244,8 +244,11 @@ def __init__(self, message_id: str, user_id: Optional[str] = None) -> None: self.data['user_id'] = self.user_id +MessageComponentsType = Union[Text, Mention, MentionAll, Image, Voice, Audio, Video, File, Location, Reply] + __all__ = [ 'Text', 'Mention', 'MentionAll', 'Image', 'Voice', 'Audio', 'Video', 'File', - 'Location', 'Reply' + 'Location', 'Reply', + 'MessageComponentsType' ]