xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-06-27 16:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1210 from fdc310/master

Browse Source 
处理at全员的atall,以及修复回复公众号和微信团队的问题
This commit is contained in:
Junyan Qin (Chin)
2025-03-19 13:03:07 +08:00
committed by GitHub
parent 9c7d8099cb 72cd444861
commit 028458b33c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/platform/sources/gewechat.py
+10 -3
View File
@@ -85,7 +85,10 @@ class GewechatMessageConverter(adapter.MessageConverter):
content_list.append(platform_message.Plain(message["Data"]["Content"]["string"].replace(at_string, '', 1))) content_list.append(platform_message.Plain(message["Data"]["Content"]["string"].replace(at_string, '', 1)))
# 更优雅的替换改名后@机器人，仅仅限于单独AT的情况 # 更优雅的替换改名后@机器人，仅仅限于单独AT的情况
elif "PushContent" in message['Data'] and '在群聊中@了你' in message["Data"]["PushContent"]: elif "PushContent" in message['Data'] and '在群聊中@了你' in message["Data"]["PushContent"]:
content_list.append(platform_message.At(target=bot_account_id)) if '@所有人' in message["Data"]["Content"]["string"]: # at全员时候传入atll不当作at自己
content_list.append(platform_message.AtAll())
else:
content_list.append(platform_message.At(target=bot_account_id))
content_list.append(platform_message.Plain(re.sub(pattern, '', message["Data"]["Content"]["string"]))) content_list.append(platform_message.Plain(re.sub(pattern, '', message["Data"]["Content"]["string"])))
else: else:
content_list = [platform_message.Plain(message["Data"]["Content"]["string"])] content_list = [platform_message.Plain(message["Data"]["Content"]["string"])]
@@ -224,10 +227,14 @@ class GewechatEventConverter(adapter.EventConverter):
event: dict, event: dict,
bot_account_id: str bot_account_id: str
) -> platform_events.MessageEvent: ) -> platform_events.MessageEvent:
# print(event)
# 排除自己发消息回调回答问题
if event['Wxid'] == event['Data']['FromUserName']['string']: if event['Wxid'] == event['Data']['FromUserName']['string']:
return None return None
# print(event) # 排除公众号以及微信团队消息
if event['Data']['FromUserName']['string'].startswith('gh_')\
or event['Data']['FromUserName']['string'].startswith('weixin'):
return None
message_chain = await self.message_converter.target2yiri(copy.deepcopy(event), bot_account_id) message_chain = await self.message_converter.target2yiri(copy.deepcopy(event), bot_account_id)
if not message_chain: if not message_chain: