From 0a4df8296eb5a89c996077b953622313bab5975a Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Sun, 20 Aug 2023 23:45:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B:=20=E4=BF=AE=E5=A4=8D=E8=AF=8D?=
 =?UTF-8?q?=E6=9D=A1=E5=9B=9E=E7=AD=94=E5=8C=85=E5=90=ABat=E6=97=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=A8=A1=E7=B3=8A|=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E7=AD=89=E9=97=AE=E6=97=B6=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                        | 4 ++++
 plugins/word_bank/word_handle.py | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2ce97a9c..5206db95 100644
--- a/README.md
+++ b/README.md
@@ -331,6 +331,10 @@ PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能
 
 ## 更新
 
+### 2022/8/20
+
+* 修复词条回答包含at时使用模糊|正则等问时无法正确匹配问题
+
 ### 2023/8/7
 
 * 添加 本地图库插件 防吞图特性 [@pull/1468](https://github.com/HibiKier/zhenxun_bot/pull/1468)
diff --git a/plugins/word_bank/word_handle.py b/plugins/word_bank/word_handle.py
index 30860a0f..92677dcf 100644
--- a/plugins/word_bank/word_handle.py
+++ b/plugins/word_bank/word_handle.py
@@ -134,9 +134,10 @@ async def _(
         answer = ""
         problem = ""
         for index, seg in enumerate(event.message):
-            if seg.type == "text" and "添加词条问" in str(seg) and is_first:
+            r = re.search("添加词条(模糊|正则|图片)?问", str(seg))
+            if seg.type == "text" and r and is_first:
                 is_first = False
-                seg_ = str(seg).split("添加词条问")[-1]
+                seg_ = str(seg).split(f"添加词条{r.group(1) or ''}问")[-1]
                 cur_p = "problem"
                 # 纯文本
                 if "答" in seg_:
@@ -302,7 +303,9 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
             ):
                 await show_word_matcher.finish("gid必须为数字且在范围内")
             gid = int(gid)
-        msg_list = await show_word(problem, id_, gid, None if gid else str(event.group_id))
+        msg_list = await show_word(
+            problem, id_, gid, None if gid else str(event.group_id)
+        )
     else:
         msg_list = await show_word(problem, None, None, str(event.group_id))
     if isinstance(msg_list, str):