From 351ba571f25e918dc982de2ef9c7de7058ac8336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wuyi=E6=97=A0=E7=96=91?= <444835641@qq.com> Date: Sat, 5 Aug 2023 22:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8DQQGuild?= =?UTF-8?q?=E7=9A=84DMS=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GenshinUID/client.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/GenshinUID/client.py b/GenshinUID/client.py index 285df4e4..f2d02eab 100644 --- a/GenshinUID/client.py +++ b/GenshinUID/client.py @@ -121,6 +121,7 @@ class GsClient: node = [] file = '' at_list = [] + group_id = '' if msg.content: for _c in msg.content: if _c.data: @@ -134,6 +135,8 @@ class GsClient: file = _c.data elif _c.type == 'at': at_list.append(_c.data) + elif _c.type == 'group': + group_id = _c.data else: pass @@ -187,6 +190,7 @@ class GsClient: msg.target_id, msg.target_type, msg.msg_id, + group_id, ) elif msg.bot_id == 'telegram': await telegram_send( @@ -364,6 +368,7 @@ async def guild_send( target_id: Optional[str], target_type: Optional[str], msg_id: Optional[str], + guild_id: Optional[str], ): async def _send(content: Optional[str], image: Optional[str]): result: Dict[str, Any] = {'msg_id': msg_id} @@ -382,9 +387,14 @@ async def guild_send( **result, ) else: + dms = await bot.call_api( + 'post_dms', + recipient_id=str(target_id), + source_guild_id=str(guild_id), + ) await bot.call_api( 'post_dms_messages', - guild_id=int(target_id) if target_id else 0, + guild_id=dms.guild_id, **result, )