From df6cb71e3faf8c42def35736dd2697d7b20a2904 Mon Sep 17 00:00:00 2001 From: scdhh Date: Wed, 25 May 2022 18:00:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9=E6=9F=A5bo?= =?UTF-8?q?t=E8=87=AA=E8=BA=AB=E7=9A=84=E6=83=85=E5=86=B5=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E5=88=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot_plugin_tetris_stats/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nonebot_plugin_tetris_stats/__init__.py b/nonebot_plugin_tetris_stats/__init__.py index 411339d..3d46531 100644 --- a/nonebot_plugin_tetris_stats/__init__.py +++ b/nonebot_plugin_tetris_stats/__init__.py @@ -30,7 +30,7 @@ topStats = on_regex(pattern=r'^top查|^topstats', flags=I, permission=GROUP) @ioBind.handle() async def bindIOUser(event: MessageEvent, matcher: Matcher): - decodedMessage = await handleBindMessage(message=str(event.get_message()), gameType='IO') + decodedMessage = await handleBindMessage(message=event.raw_message, gameType='IO') if decodedMessage['Success'] is True: if decodedMessage['Type'] == 'ID': userIDInfo = await IOgetUserIDInfo(userID=decodedMessage['User']) @@ -48,9 +48,11 @@ async def bindIOUser(event: MessageEvent, matcher: Matcher): @ioStats.handle() async def handleIOStatsQuery(event: MessageEvent, matcher: Matcher): - decodedMessage = await handleStatsQueryMessage(message=str(event.get_message()), gameType='IO') + decodedMessage = await handleStatsQueryMessage(message=event.raw_message, gameType='IO') if decodedMessage['Success'] is True: if decodedMessage['Type'] == 'AT': + if event.is_tome() is True: + await matcher.finish(message='不能查询bot的信息') bindInfo = await queryBindInfo(QQNumber=decodedMessage['QQNumber'], gameType='IO') if bindInfo['Hit'] is True: message = (f'* 由于无法验证绑定信息，不能保证查询到的用户为本人\n{await IOgenerateMessage(userID=bindInfo["User"])}') @@ -73,9 +75,11 @@ async def handleIOStatsQuery(event: MessageEvent, matcher: Matcher): @tosStats.handle() async def handleTOSStatsQuery(event: MessageEvent, matcher: Matcher): - decodedMessage = await handleStatsQueryMessage(message=str(event.get_message()), gameType='TOS') + decodedMessage = await handleStatsQueryMessage(message=event.raw_message, gameType='TOS') if decodedMessage['Success'] is True: if decodedMessage['Type'] == 'AT' or decodedMessage['Type'] == 'QQ': + if decodedMessage['QQNumber'] == event.self_id: + await matcher.finish(message='不能查询bot的信息') message = await TOSgenerateMessage(teaID=decodedMessage['QQNumber']) elif decodedMessage['Type'] == 'ME': message = await TOSgenerateMessage(teaID=event.sender.user_id)