Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-10-09 13:50:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复词条At时bug与模糊查询时无法替换占位符问题

Browse Source
This commit is contained in:
HibiKier
2023-03-25 21:16:48 +08:00
parent f72988a71a
commit b2a2776fe3
5 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/word_bank/_model.py
+6 -6
View File
@@ -138,7 +138,7 @@ class WordBank(Model):
word_scope=word_scope,
word_type=word_type,
status=True,
problem=problem,
problem=str(problem).strip(),
answer=answer,
image_path=image_path,
placeholder=",".join(_list),
@@ -220,17 +220,17 @@ class WordBank(Model):
answer=answer,
)
if query and query.placeholder:
type_list = re.findall(rf"\[(.*?):placeholder_.*?]", answer)
temp_answer = re.sub(rf"\[(.*?):placeholder_.*?]", "{}", answer)
type_list = re.findall(rf"\[(.*?):placeholder_.*?]", str(answer))
temp_answer = re.sub(rf"\[(.*?):placeholder_.*?]", "{}", str(answer))
seg_list = []
for t, p in zip(type_list, query.placeholder.split(",")):
if t == "image":
seg_list.append(image(path / p))
elif t == "face":
seg_list.append(face(p))
seg_list.append(face(int(p)))
elif t == "at":
seg_list.append(at(p))
return MessageTemplate(temp_answer, Message).format(*seg_list)
return MessageTemplate(temp_answer, Message).format(*seg_list) # type: ignore
return answer
@classmethod
@@ -302,7 +302,7 @@ class WordBank(Model):
answer = random.choice(data_list)
return (
await cls._format2answer(
problem, answer.answer, answer.user_qq, answer.group_id
answer.problem, answer.answer, answer.user_qq, answer.group_id
)
if answer.placeholder
else answer.answer