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

feat(gewechat): 新增引用消息转发+@在引用中的bug修复 (#1361)

Browse Source 
* feat(bugfix): 群消息替换@用户时, 限制下长度

* bugfix(gewechat): 修复@逻辑

* feat(gewechat): 把引用内容暴露出来，插件才可以定制化

* bugfix(gewechat): 空值处理
This commit is contained in:
shinelin
2025-05-04 16:05:01 +08:00
committed by GitHub
parent 7538973b33
commit 2a6ca9cb97
2 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/platform/sources/gewechat.py
+45 -34
View File
@@ -66,7 +66,10 @@ class GewechatMessageConverter(adapter.MessageConverter):
elif isinstance(component, platform_message.WeChatForwardFile): elif isinstance(component, platform_message.WeChatForwardFile):
content_list.append({'type': 'WeChatForwardFile', 'xml_data': component.xml_data}) content_list.append({'type': 'WeChatForwardFile', 'xml_data': component.xml_data})
elif isinstance(component, platform_message.WeChatAppMsg): elif isinstance(component, platform_message.WeChatAppMsg):
content_list.append({'type': 'WeChatAppMsg', 'app_msg': component.app_msg}) content_list.append({'type': 'WeChatAppMsg', 'app_msg': component.app_msg})
# 引用消息转发
elif isinstance(component, platform_message.WeChatForwardQuote):
content_list.append({'type': 'WeChatAppMsg', 'app_msg': component.app_msg})
elif isinstance(component, platform_message.Forward): elif isinstance(component, platform_message.Forward):
for node in component.node_list: for node in component.node_list:
if node.message_chain: if node.message_chain:
@@ -124,7 +127,7 @@ class GewechatMessageConverter(adapter.MessageConverter):
) -> platform_message.MessageChain: ) -> platform_message.MessageChain:
"""处理文本消息 (msg_type=1)""" """处理文本消息 (msg_type=1)"""
if message and self._is_group_message(message): if message and self._is_group_message(message):
pattern = r'@\S+' pattern = r'@\S{1,20}'
content_no_preifx = re.sub(pattern, '', content_no_preifx) content_no_preifx = re.sub(pattern, '', content_no_preifx)
return platform_message.MessageChain([platform_message.Plain(content_no_preifx)]) return platform_message.MessageChain([platform_message.Plain(content_no_preifx)])
@@ -199,25 +202,28 @@ class GewechatMessageConverter(adapter.MessageConverter):
try: try:
xml_data = ET.fromstring(content_no_preifx) xml_data = ET.fromstring(content_no_preifx)
appmsg_data = xml_data.find('.//appmsg') appmsg_data = xml_data.find('.//appmsg')
data_type = appmsg_data.findtext('.//type', "") if appmsg_data:
data_type = appmsg_data.findtext('.//type', "")
# 二次分派处理器 # 二次分派处理器
sub_handler_map = { sub_handler_map = {
'57': self._handler_compound_quote, '57': self._handler_compound_quote,
'5': self._handler_compound_link, '5': self._handler_compound_link,
'6': self._handler_compound_file, '6': self._handler_compound_file,
'33': self._handler_compound_mini_program, '33': self._handler_compound_mini_program,
'36': self._handler_compound_mini_program, '36': self._handler_compound_mini_program,
'2000': partial(self._handler_compound_unsupported, text="[转账消息]"), '2000': partial(self._handler_compound_unsupported, text="[转账消息]"),
'2001': partial(self._handler_compound_unsupported, text="[红包消息]"), '2001': partial(self._handler_compound_unsupported, text="[红包消息]"),
'51': partial(self._handler_compound_unsupported, text="[视频号消息]"), '51': partial(self._handler_compound_unsupported, text="[视频号消息]"),
} }
handler = sub_handler_map.get(data_type, self._handler_compound_unsupported) handler = sub_handler_map.get(data_type, self._handler_compound_unsupported)
return await handler( return await handler(
message=message, #原始msg message=message, #原始msg
xml_data=xml_data, # xml数据 xml_data=xml_data, # xml数据
) )
else:
return platform_message.MessageChain([platform_message.Unknown(text=content_no_preifx)])
except Exception as e: except Exception as e:
print(f"解析复合消息失败: {str(e)}") print(f"解析复合消息失败: {str(e)}")
return platform_message.MessageChain([platform_message.Unknown(text=content_no_preifx)]) return platform_message.MessageChain([platform_message.Unknown(text=content_no_preifx)])
@@ -228,6 +234,7 @@ class GewechatMessageConverter(adapter.MessageConverter):
xml_data: ET.Element xml_data: ET.Element
) -> platform_message.MessageChain: ) -> platform_message.MessageChain:
"""处理引用消息 (data_type=57)""" """处理引用消息 (data_type=57)"""
message_list = []
# print("_handler_compound_quote", ET.tostring(xml_data, encoding='unicode')) # print("_handler_compound_quote", ET.tostring(xml_data, encoding='unicode'))
appmsg_data = xml_data.find('.//appmsg') appmsg_data = xml_data.find('.//appmsg')
quote_data = "" # 引用原文 quote_data = "" # 引用原文
@@ -236,13 +243,15 @@ class GewechatMessageConverter(adapter.MessageConverter):
user_data = "" # 用户消息 user_data = "" # 用户消息
sender_id = xml_data.findtext('.//fromusername') # 发送方：单聊用户/群member sender_id = xml_data.findtext('.//fromusername') # 发送方：单聊用户/群member
if appmsg_data: if appmsg_data:
user_data = appmsg_data.findtext('.//title') or "" user_data = appmsg_data.findtext('.//title') or ""
quote_data = appmsg_data.find('.//refermsg').findtext('.//content') quote_data = appmsg_data.find('.//refermsg').findtext('.//content')
quote_id = appmsg_data.find('.//refermsg').findtext('.//chatusr') quote_id = appmsg_data.find('.//refermsg').findtext('.//chatusr')
message_list.append(
platform_message.WeChatForwardQuote(
app_msg=ET.tostring(appmsg_data, encoding='unicode'))
)
if message: if message:
tousername = message['Wxid'] tousername = message['Wxid']
message_list = []
# quote_data原始的消息 # quote_data原始的消息
if quote_data: if quote_data:
quote_data_message_list = platform_message.MessageChain() quote_data_message_list = platform_message.MessageChain()
@@ -272,17 +281,18 @@ class GewechatMessageConverter(adapter.MessageConverter):
) )
) )
if len(user_data) > 0: if len(user_data) > 0:
pattern = r'^@\S+' pattern = r'@\S{1,20}'
user_data = re.sub(pattern, '', user_data) user_data = re.sub(pattern, '', user_data)
message_list.append(platform_message.Plain(user_data)) message_list.append(platform_message.Plain(user_data))
# print(f"**_handler_compound_quote message_list len={len(message_list)}")
# for comp in message_list: # for comp in message_list:
# if isinstance(comp, platform_message.Quote): # if isinstance(comp, platform_message.Quote):
# print(f"**_handler_compound_quote send_id {comp.sender_id}" ) # print(f"quote_message_chain len={len(message_list)}")
# print(f"quote_message_chain send_id={comp.sender_id}" )
# for quote_item in comp.origin: # for quote_item in comp.origin:
# print(f"******* _handler_compound_quote item {quote_item.type} + message: {quote_item}" ) # print(f"--quote_message_component [msg_type={quote_item.type}][message={quote_item}]" )
# else: # else:
# print(f"_handler_compound_quote type: {comp.type} + message: {comp}") # print(f"quote_message_chain plain [msg_type={comp.type}][message={comp.text}]")
return platform_message.MessageChain(message_list) return platform_message.MessageChain(message_list)
async def _handler_compound_file( async def _handler_compound_file(
@@ -375,8 +385,8 @@ class GewechatMessageConverter(adapter.MessageConverter):
to_user_name = message['Wxid'] # 接收方: 所属微信的wxid to_user_name = message['Wxid'] # 接收方: 所属微信的wxid
raw_content = message["Data"]["Content"]["string"] # 原始消息内容 raw_content = message["Data"]["Content"]["string"] # 原始消息内容
content_no_prefix, _ = self._extract_content_and_sender(raw_content) content_no_prefix, _ = self._extract_content_and_sender(raw_content)
# 直接艾特机器人 # 直接艾特机器人（这个有bug，当被引用的消息里面有@bot,会套娃
ats_bot = ats_bot or (f"@{bot_account_id}" in content_no_prefix) # ats_bot = ats_bot or (f"@{bot_account_id}" in content_no_prefix)
# 文本类@bot # 文本类@bot
push_content = message.get('Data', {}).get('PushContent', '') push_content = message.get('Data', {}).get('PushContent', '')
ats_bot = ats_bot or ('在群聊中@了你' in push_content) ats_bot = ats_bot or ('在群聊中@了你' in push_content)
@@ -390,9 +400,10 @@ class GewechatMessageConverter(adapter.MessageConverter):
if message.get('Data', {}).get('MsgType', 0) == 49: if message.get('Data', {}).get('MsgType', 0) == 49:
xml_data = ET.fromstring(content_no_prefix) xml_data = ET.fromstring(content_no_prefix)
appmsg_data = xml_data.find('.//appmsg') appmsg_data = xml_data.find('.//appmsg')
tousername = message['Wxid'] # 接收方: 所属微信的wxid tousername = message['Wxid']
quote_id = appmsg_data.find('.//refermsg').findtext('.//chatusr') # 引用消息的原发送者 if appmsg_data: # 接收方: 所属微信的wxid
ats_bot = ats_bot or (quote_id == tousername) quote_id = appmsg_data.find('.//refermsg').findtext('.//chatusr') # 引用消息的原发送者
ats_bot = ats_bot or (quote_id == tousername)
except Exception as e: except Exception as e:
print(f"_ats_bot got except: {e}") print(f"_ats_bot got except: {e}")
finally: finally:
pkg/platform/types/message.py
+8
View File
@@ -894,3 +894,11 @@ class WeChatAppMsg(MessageComponent):
app_msg: str app_msg: str
def __str__(self): def __str__(self):
return self.app_msg return self.app_msg
class WeChatForwardQuote(MessageComponent):
"""转发引用消息。个人微信专用组件。"""
type: str = 'WeChatForwardQuote'
"""xml数据"""
app_msg: str
def __str__(self):
return self.app_msg