ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-28 08:12:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ implement message target guessing

Browse Source
This commit is contained in:
StarHeartHunt 2021-07-06 10:45:00 +08:00
parent 0c39300f4b
commit 811e94e186
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py
View File

@ -10,7 +10,7 @@ from nonebot.adapters import Bot as BaseBot
from nonebot.drivers import Driver, HTTPRequest, HTTPResponse from nonebot.drivers import Driver, HTTPRequest, HTTPResponse
from .config import Config as FeishuConfig 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 .exception import ActionFailed, ApiNotAvailable, NetworkError
from .message import Message, MessageSegment from .message import Message, MessageSegment
from .utils import log, AESCipher from .utils import log, AESCipher
@ -103,6 +103,7 @@ class Bot(BaseBot):
super().register(driver, config) super().register(driver, config)
cls.feishu_config = FeishuConfig(**config.dict()) cls.feishu_config = FeishuConfig(**config.dict())
#TODO:校验schema 要求为2.0
@classmethod @classmethod
@overrides(BaseBot) @overrides(BaseBot)
async def check_permission( async def check_permission(
@ -186,6 +187,7 @@ class Bot(BaseBot):
def _construct_url(self, path: str) -> str: def _construct_url(self, path: str) -> str:
return self.api_root + path return self.api_root + path
#TODO:实现token缓存与ttl
async def _fetch_tenant_access_token(self) -> str: async def _fetch_tenant_access_token(self) -> str:
try: try:
async with httpx.AsyncClient() as client: async with httpx.AsyncClient() as client:
@ -270,18 +272,23 @@ class Bot(BaseBot):
MessageSegment], MessageSegment],
**kwargs) -> Any: **kwargs) -> Any:
msg = message if isinstance(message, Message) else Message(message) 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 = { params = {
"receive_id": "query": {
event.event.message.chat_id if isinstance( "receive_id_type": receive_id_type
event, GroupMessageEvent) else event.get_user_id(), },
"content": "body": {
str(message), "receive_id": receive_id,
"msg_type": "content": str(message),
"text" if len(message) == 1 else "content" "msg_type": "text" if len(message) == 1 else "content"
}
} }
receive_id_type = 'chat_id' if isinstance( return await self.call_api(f"im/v1/messages", **params)
event, GroupMessageEvent) else 'union_id'
return await self.call_api(
f"im/v1/messages?receive_id_type={receive_id_type}", **params)