From f2d45a366850eb3310e6fe48683565683ecf85f0 Mon Sep 17 00:00:00 2001 From: Dong_master <2213070223@qq.com> Date: Sun, 16 Mar 2025 21:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86bot=E8=B4=A6=E5=8F=B7=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E5=88=B0=E8=BD=AC=E6=8D=A2=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/platform/sources/gewechat.py | 11 +++++------ pkg/utils/image.py | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/platform/sources/gewechat.py b/pkg/platform/sources/gewechat.py index 9d92276b..5227a52d 100644 --- a/pkg/platform/sources/gewechat.py +++ b/pkg/platform/sources/gewechat.py @@ -78,8 +78,6 @@ class GewechatMessageConverter(adapter.MessageConverter): pattern = r'@\S+' at_string = f"@{bot_account_id}" content_list = [] - if message['Wxid'] == message['Data']['FromUserName']['string']: - return platform_message.MessageChain() if at_string in message["Data"]["Content"]["string"]: content_list.append(platform_message.At(target=bot_account_id)) content_list.append(platform_message.Plain(message["Data"]["Content"]["string"].replace(at_string, '', 1))) @@ -88,10 +86,7 @@ class GewechatMessageConverter(adapter.MessageConverter): content_list.append(platform_message.At(target=bot_account_id)) content_list.append(platform_message.Plain(re.sub(pattern, '', message["Data"]["Content"]["string"]))) else: - if message['Wxid'] == message['Data']['FromUserName']['string']: - pass - else: - content_list = [platform_message.Plain(message["Data"]["Content"]["string"])] + content_list = [platform_message.Plain(message["Data"]["Content"]["string"])] return platform_message.MessageChain(content_list) @@ -166,6 +161,10 @@ class GewechatEventConverter(adapter.EventConverter): event: dict, bot_account_id: str ) -> platform_events.MessageEvent: + + if event['Wxid'] == event['Data']['FromUserName']['string']: + return None + message_chain = await self.message_converter.target2yiri(copy.deepcopy(event), bot_account_id) if not message_chain: diff --git a/pkg/utils/image.py b/pkg/utils/image.py index 397707bf..760c2128 100644 --- a/pkg/utils/image.py +++ b/pkg/utils/image.py @@ -70,7 +70,7 @@ async def get_gewechat_image_base64( } ) as response: if response.status != 200: - print(response) + # print(response) raise Exception(f"获取gewechat图片下载失败: {await response.text()}") resp_data = await response.json()