⚗️ add call_api hook

packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py

@@ -328,32 +328,7 @@ class Bot(BaseBot):
             )
 
     @overrides(BaseBot)
-    async def call_api(self, api: str, **data) -> Any:
-        """
-        :说明:
-
-          调用 CQHTTP 协议 API
-
-        :参数:
-
-          * ``api: str``: API 名称
-          * ``**data: Any``: API 参数
-
-        :返回:
-
-          - ``Any``: API 调用返回数据
-
-        :异常:
-
-          - ``NetworkError``: 网络错误
-          - ``ActionFailed``: API 调用失败
-        """
-        if "self_id" in data:
-            self_id = data.pop("self_id")
-            if self_id:
-                bot = self.driver.bots[str(self_id)]
-                return await bot.call_api(api, **data)
-
+    async def _call_api(self, api: str, **data) -> Any:
         log("DEBUG", f"Calling API <y>{api}</y>")
         if self.connection_type == "websocket":
             seq = ResultStore.get_seq()
@@ -396,6 +371,29 @@ class Bot(BaseBot):
             except httpx.HTTPError:
                 raise NetworkError("HTTP request failed")
 
+    @overrides(BaseBot)
+    async def call_api(self, api: str, **data) -> Any:
+        """
+        :说明:
+
+          调用 CQHTTP 协议 API
+
+        :参数:
+
+          * ``api: str``: API 名称
+          * ``**data: Any``: API 参数
+
+        :返回:
+
+          - ``Any``: API 调用返回数据
+
+        :异常:
+
+          - ``NetworkError``: 网络错误
+          - ``ActionFailed``: API 调用失败
+        """
+        return super().call_api(api, **data)
+
     @overrides(BaseBot)
     async def send(self,
                    event: Event,

packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi

@@ -68,7 +68,8 @@ class Bot(BaseBot):
     async def handle_message(self, message: dict):
         ...
 
-    async def call_api(self, api: str, **data) -> Any:
+    async def call_api(self, api: str, *, self_id: Optional[str],
+                       **data) -> Any:
         ...
 
     async def send(self, event: Event, message: Union[str, Message,

packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py

@@ -109,37 +109,13 @@ class Bot(BaseBot):
         return
 
     @overrides(BaseBot)
-    async def call_api(self,
-                       api: str,
-                       event: Optional[MessageEvent] = None,
-                       **data) -> Any:
-        """
-        :说明:
-
-          调用 钉钉 协议 API
-
-        :参数:
-
-          * ``api: str``: API 名称
-          * ``**data: Any``: API 参数
-
-        :返回:
-
-          - ``Any``: API 调用返回数据
-
-        :异常:
-
-          - ``NetworkError``: 网络错误
-          - ``ActionFailed``: API 调用失败
-        """
+    async def _call_api(self,
+                        api: str,
+                        event: Optional[MessageEvent] = None,
+                        **data) -> Any:
         if self.connection_type != "http":
             log("ERROR", "Only support http connection.")
             return
-        if "self_id" in data:
-            self_id = data.pop("self_id")
-            if self_id:
-                bot = self.driver.bots[str(self_id)]
-                return await bot.call_api(api, **data)
 
         log("DEBUG", f"Calling API <y>{api}</y>")
         params = {}
@@ -192,6 +168,33 @@ class Bot(BaseBot):
         except httpx.HTTPError:
             raise NetworkError("HTTP request failed")
 
+    @overrides(BaseBot)
+    async def call_api(self,
+                       api: str,
+                       event: Optional[MessageEvent] = None,
+                       **data) -> Any:
+        """
+        :说明:
+
+          调用 钉钉 协议 API
+
+        :参数:
+
+          * ``api: str``: API 名称
+          * ``event: Optional[MessageEvent]``: Event 对象
+          * ``**data: Any``: API 参数
+
+        :返回:
+
+          - ``Any``: API 调用返回数据
+
+        :异常:
+
+          - ``NetworkError``: 网络错误
+          - ``ActionFailed``: API 调用失败
+        """
+        return super().call_api(api, event=event, **data)
+
     @overrides(BaseBot)
     async def send(self,
                    event: MessageEvent,

packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py

@@ -218,6 +218,10 @@ class Bot(BaseBot):
         except Exception as e:
             Log.error(f'Failed to handle message: {message}', e)
 
+    @overrides(BaseBot)
+    async def _call_api(self, api: str, **data) -> NoReturn:
+        raise NotImplementedError
+
     @overrides(BaseBot)
     async def call_api(self, api: str, **data) -> NoReturn:
         """