适配频道私信消息

This commit is contained in:
Wuyi无疑 2023-03-11 18:45:37 +08:00
parent 36f2ba48ee
commit 92dc288776

View File

@ -1,4 +1,4 @@
from typing import List, Optional from typing import List, Literal, Optional
from nonebot.log import logger from nonebot.log import logger
from nonebot.matcher import Matcher from nonebot.matcher import Matcher
@ -30,13 +30,16 @@ async def send_char_adv(ev: Event):
group_id = sessions[-2] if len(sessions) >= 2 else None group_id = sessions[-2] if len(sessions) >= 2 else None
message: List[Message] = [] message: List[Message] = []
msg_id = '' msg_id = ''
sp_user_type: Optional[
Literal['group', 'direct', 'channel', 'sub_channel']
] = None
# qqguild # qqguild
if '_message' in raw_data: if '_message' in raw_data:
messages = raw_data['_message'] messages = raw_data['_message']
if 'direct_message' in raw_data and raw_data['direct_message']: if 'direct_message' in raw_data and raw_data['direct_message']:
group_id = None sp_user_type = 'direct'
user_id = str(raw_data['guild_id']) group_id = str(raw_data['guild_id'])
else: else:
group_id = str(raw_data['channel_id']) group_id = str(raw_data['channel_id'])
msg_id = raw_data['id'] msg_id = raw_data['id']
@ -75,9 +78,10 @@ async def send_char_adv(ev: Event):
if not message: if not message:
return return
user_type = 'group' if group_id else 'direct'
msg = MessageReceive( msg = MessageReceive(
bot_id=bot_id, bot_id=bot_id,
user_type='group' if group_id else 'direct', user_type=sp_user_type if sp_user_type else user_type,
group_id=group_id, group_id=group_id,
user_id=user_id, user_id=user_id,
content=message, content=message,