xuthus/LittlePaimon
1
0
Fork 0
mirror of https://github.com/xuthus83/LittlePaimon.git synced 2024-12-16 13:40:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 修复Wiki特产图鉴无匹配时的错误提示

Browse Source
This commit is contained in:
CMHopeSunshine 2022-12-31 12:44:55 +08:00
parent 1daea6a038
commit b22c98f6fc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LittlePaimon/plugins/Paimon_Wiki/Atlas/api.py
View File

@ -43,7 +43,7 @@ async def get_match_specialty(name: str) -> Optional[list]:
resp = await aiorequests.get(SPECIALTY_RESOURCES_API.format(proxy=config.github_proxy))
data = resp.json()['specialty']
return (
difflib.get_close_matches(name, data, cutoff=0.6, n=10)
difflib.get_close_matches(name, list(data.keys()), cutoff=0.6, n=10)
if name != '全部'
else list(data.keys())
)

10
LittlePaimon/plugins/Paimon_Wiki/__init__.py
View File

@ -269,10 +269,10 @@ async def _(bot: Bot, event: MessageEvent, state: T_State, type: str = Arg('type
elif type.startswith('七圣召唤'):
if name == '全部':
matches = await get_match_card(name)
else:
matches = {'七圣召唤': await get_match_card(name)}
elif type == '特产图鉴':
matches = {'特产': await get_match_specialty(name)}
elif c := await get_match_card(name):
matches = {'七圣召唤': c}
elif type == '特产图鉴' and (s := await get_match_specialty(name)):
matches = {'特产': s}
else:
if re.match('^[火水冰雷风岩草](元素|属性|系)?$', name):
matches = {'角色': type_file['角色']['元素类型'][name[0]]}
@ -374,7 +374,7 @@ async def _(state: T_State, matches: dict = Arg('matches'), choice: str = ArgPla
except ActionFailed:
await total_wiki.finish(f'{final_name}的{type}发送失败，可能是网络问题或者不存在该资源')
elif state['times'] == 2:
await total_wiki.finish(f'旅行者似乎不太能理解，下次再问我吧{MessageSegment.face(146)}')
await total_wiki.finish('旅行者似乎不太能理解，下次再问我吧' + MessageSegment.face(146))
else:
state['times'] = state['times'] + 1
await total_wiki.reject(f'请旅行者从上面的{type}中选一个问{NICKNAME}或回答\"取消\"可以取消查询', at_sender=True)