mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-07-20 03:16:14 +00:00
Merge pull request #1198 from fdc310/master
当机器人群名称改名后群聊单独at机器人时候替换@信息为空
This commit is contained in:
@@ -62,20 +62,29 @@ class GewechatMessageConverter(adapter.MessageConverter):
|
|||||||
bot_account_id: str
|
bot_account_id: str
|
||||||
) -> platform_message.MessageChain:
|
) -> platform_message.MessageChain:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if message["Data"]["MsgType"] == 1:
|
if message["Data"]["MsgType"] == 1:
|
||||||
# 检查消息开头,如果有 wxid_sbitaz0mt65n22:\n 则删掉
|
# 检查消息开头,如果有 wxid_sbitaz0mt65n22:\n 则删掉
|
||||||
regex = re.compile(r"^wxid_.*:")
|
regex = re.compile(r"^wxid_.*:")
|
||||||
|
# print(message)
|
||||||
|
|
||||||
line_split = message["Data"]["Content"]["string"].split("\n")
|
line_split = message["Data"]["Content"]["string"].split("\n")
|
||||||
|
|
||||||
if len(line_split) > 0 and regex.match(line_split[0]):
|
if len(line_split) > 0 and regex.match(line_split[0]):
|
||||||
message["Data"]["Content"]["string"] = "\n".join(line_split[1:])
|
message["Data"]["Content"]["string"] = "\n".join(line_split[1:])
|
||||||
|
|
||||||
at_string = f'@{bot_account_id}'
|
# 正则表达式模式,匹配'@'后跟任意数量的非空白字符
|
||||||
|
pattern = r'@\S+'
|
||||||
|
at_string = f"@{bot_account_id}"
|
||||||
content_list = []
|
content_list = []
|
||||||
if at_string in message["Data"]["Content"]["string"]:
|
if at_string in message["Data"]["Content"]["string"]:
|
||||||
content_list.append(platform_message.At(target=bot_account_id))
|
content_list.append(platform_message.At(target=bot_account_id))
|
||||||
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的情况
|
||||||
|
elif '在群聊中@了你' in message["Data"]["PushContent"]:
|
||||||
|
content_list.append(platform_message.At(target=bot_account_id))
|
||||||
|
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"])]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user