From 811e94e186d811f273b296f641f99f6b6f20d36d Mon Sep 17 00:00:00 2001
From: StarHeartHunt <starheart233@gmail.com>
Date: Tue, 6 Jul 2021 10:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20implement=20message=20target=20gues?=
 =?UTF-8?q?sing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonebot/adapters/feishu/bot.py            | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py
index 407a202c..88932aae 100644
--- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py
+++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py
@@ -10,7 +10,7 @@ from nonebot.adapters import Bot as BaseBot
 from nonebot.drivers import Driver, HTTPRequest, HTTPResponse
 
 from .config import Config as FeishuConfig
-from .event import Event, GroupMessageEvent, get_event_model
+from .event import Event, GroupMessageEvent, PrivateMessageEvent, get_event_model
 from .exception import ActionFailed, ApiNotAvailable, NetworkError
 from .message import Message, MessageSegment
 from .utils import log, AESCipher
@@ -103,6 +103,7 @@ class Bot(BaseBot):
         super().register(driver, config)
         cls.feishu_config = FeishuConfig(**config.dict())
 
+    #TODO:校验schema 要求为2.0
     @classmethod
     @overrides(BaseBot)
     async def check_permission(
@@ -186,6 +187,7 @@ class Bot(BaseBot):
     def _construct_url(self, path: str) -> str:
         return self.api_root + path
 
+    #TODO:实现token缓存与ttl
     async def _fetch_tenant_access_token(self) -> str:
         try:
             async with httpx.AsyncClient() as client:
@@ -270,18 +272,23 @@ class Bot(BaseBot):
                                                       MessageSegment],
                    **kwargs) -> Any:
         msg = message if isinstance(message, Message) else Message(message)
+
+        if isinstance(event, GroupMessageEvent):
+            receive_id, receive_id_type = event.event.message.chat_id, 'chat_id'
+        elif isinstance(event, PrivateMessageEvent):
+            receive_id, receive_id_type = event.get_user_id(), 'union_id'
+        else:
+            raise ValueError(
+                "Cannot guess `receive_id` and `receive_id_type` to reply!")
         params = {
-            "receive_id":
-                event.event.message.chat_id if isinstance(
-                    event, GroupMessageEvent) else event.get_user_id(),
-            "content":
-                str(message),
-            "msg_type":
-                "text" if len(message) == 1 else "content"
+            "query": {
+                "receive_id_type": receive_id_type
+            },
+            "body": {
+                "receive_id": receive_id,
+                "content": str(message),
+                "msg_type": "text" if len(message) == 1 else "content"
+            }
         }
 
-        receive_id_type = 'chat_id' if isinstance(
-            event, GroupMessageEvent) else 'union_id'
-
-        return await self.call_api(
-            f"im/v1/messages?receive_id_type={receive_id_type}", **params)
+        return await self.call_api(f"im/v1/messages", **params)