From 102162f1d821bf8f172a66057ea2e322ef0f34fb Mon Sep 17 00:00:00 2001 From: jigsaw Date: Mon, 19 Aug 2024 13:47:06 +0800 Subject: [PATCH] :bug: await get_bot_self --- nonebot_plugin_all4one/middlewares/base.py | 6 +++--- nonebot_plugin_all4one/middlewares/discord.py | 2 +- nonebot_plugin_all4one/middlewares/onebot_v11.py | 2 +- nonebot_plugin_all4one/middlewares/telegram.py | 2 +- nonebot_plugin_all4one/onebotimpl/__init__.py | 8 +++++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/nonebot_plugin_all4one/middlewares/base.py b/nonebot_plugin_all4one/middlewares/base.py index 012d7e4..db7a96a 100644 --- a/nonebot_plugin_all4one/middlewares/base.py +++ b/nonebot_plugin_all4one/middlewares/base.py @@ -54,13 +54,13 @@ async def _call_api(self, api: str, **kwargs: Any) -> Any: def self_id(self) -> str: return self.bot.self_id - def get_bot_self(self) -> BotSelf: + async def get_bot_self(self) -> BotSelf: return BotSelf( platform=self.get_platform(), user_id=self.self_id, **{ - "supported_actions": self.get_supported_actions(), - "supported_message_segments": self.get_supported_message_segments(), + "supported_actions": await self.get_supported_actions(), + "supported_message_segments": await self.get_supported_message_segments(), }, ) diff --git a/nonebot_plugin_all4one/middlewares/discord.py b/nonebot_plugin_all4one/middlewares/discord.py index b385d08..759a617 100644 --- a/nonebot_plugin_all4one/middlewares/discord.py +++ b/nonebot_plugin_all4one/middlewares/discord.py @@ -37,7 +37,7 @@ async def to_onebot_event(self, event: Event) -> list[OneBotEvent]: if (type := event.get_type()) not in ["message", "notice", "request"]: return [] event_dict["type"] = type - event_dict["self"] = self.get_bot_self().model_dump() + event_dict["self"] = (await self.get_bot_self()).model_dump() if isinstance(event, MessageEvent): event_dict["id"] = str(event.id) event_dict["time"] = event.timestamp diff --git a/nonebot_plugin_all4one/middlewares/onebot_v11.py b/nonebot_plugin_all4one/middlewares/onebot_v11.py index f7c5d8c..6d46f97 100644 --- a/nonebot_plugin_all4one/middlewares/onebot_v11.py +++ b/nonebot_plugin_all4one/middlewares/onebot_v11.py @@ -84,7 +84,7 @@ async def to_onebot_event(self, event: Event) -> list[OneBotEvent]: event_dict["type"] = event.post_type if isinstance(event, MetaEvent): return [] - event_dict["self"] = self.get_bot_self().model_dump() + event_dict["self"] = (await self.get_bot_self()).model_dump() if isinstance(event, MessageEvent): event_dict["detail_type"] = event.message_type event_dict["message"] = await self.to_onebot_message(event.original_message) diff --git a/nonebot_plugin_all4one/middlewares/telegram.py b/nonebot_plugin_all4one/middlewares/telegram.py index 57d11c2..fa9ed12 100644 --- a/nonebot_plugin_all4one/middlewares/telegram.py +++ b/nonebot_plugin_all4one/middlewares/telegram.py @@ -41,7 +41,7 @@ async def to_onebot_event(self, event: Event) -> list[OneBotEvent]: if (type := event.get_type()) not in ["message", "notice", "request"]: return [] event_dict["type"] = type - event_dict["self"] = self.get_bot_self().model_dump() + event_dict["self"] = (await self.get_bot_self()).model_dump() if isinstance(event, MessageEvent): event_dict["time"] = event.date event_dict["detail_type"] = event.get_event_name().split(".")[1] diff --git a/nonebot_plugin_all4one/onebotimpl/__init__.py b/nonebot_plugin_all4one/onebotimpl/__init__.py index 604e7a5..c6766aa 100644 --- a/nonebot_plugin_all4one/onebotimpl/__init__.py +++ b/nonebot_plugin_all4one/onebotimpl/__init__.py @@ -175,7 +175,7 @@ async def get_status(self, **kwargs: Any) -> Status: return Status( good=True, bots=[ - BotStatus(self=middleware.get_bot_self(), online=True) + BotStatus(self=await middleware.get_bot_self(), online=True) for middleware in self.middlewares.values() ], ) @@ -471,7 +471,7 @@ async def bot_connect(self, bot: Bot) -> None: sub_type="", status=Status( good=True, - bots=[BotStatus(self=middleware.get_bot_self(), online=True)], + bots=[BotStatus(self=await middleware.get_bot_self(), online=True)], ), ) await queue.put(event) @@ -488,7 +488,9 @@ async def bot_disconnect(self, bot: Bot) -> None: sub_type="", status=Status( good=True, - bots=[BotStatus(self=middleware.get_bot_self(), online=False)], + bots=[ + BotStatus(self=await middleware.get_bot_self(), online=False) + ], ), ) await queue.put(event)