kaiyuan/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-07-21 06:07:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: escape regex pattern

Browse Source
This commit is contained in:
lanvent
2023-04-22 11:39:59 +08:00
parent 361f599df0
commit 4af2c7f3d7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channel/chat_channel.py
View File

@@ -114,8 +114,8 @@ class ChatChannel(Channel):
logger.info("[WX]receive group at") logger.info("[WX]receive group at")
if not conf().get("group_at_off", False): if not conf().get("group_at_off", False):
flag = True flag = True
pattern = f"@{self.name}(\u2005|\u0020)" pattern = f"@{re.escape(self.name)}(\u2005|\u0020)"
content = re.sub(re.escape(pattern), r"", content) content = re.sub(pattern, r"", content)
if not flag: if not flag:
if context["origin_ctype"] == ContextType.VOICE: if context["origin_ctype"] == ContextType.VOICE:

4
channel/wechat/wechaty_message.py
View File

@@ -86,8 +86,8 @@ class WechatyMessage(ChatMessage, aobject):
self.is_at = await wechaty_msg.mention_self() self.is_at = await wechaty_msg.mention_self()
if not self.is_at: # 有时候复制粘贴的消息，不算做@，但是内容里面会有@xxx，这里做一下兼容 if not self.is_at: # 有时候复制粘贴的消息，不算做@，但是内容里面会有@xxx，这里做一下兼容
name = wechaty_msg.wechaty.user_self().name name = wechaty_msg.wechaty.user_self().name
pattern = f"@{name}(\u2005|\u0020)" pattern = f"@{re.escape(name)}(\u2005|\u0020)"
if re.search(re.escape(pattern), self.content): if re.search(pattern, self.content):
logger.debug(f"wechaty message {self.msg_id} include at") logger.debug(f"wechaty message {self.msg_id} include at")
self.is_at = True self.is_at = True