bugfix
This commit is contained in:
parent
ecb99df7ae
commit
0c79f15b7c
4 changed files with 20 additions and 5 deletions
|
@ -65,7 +65,7 @@ class MessageSession:
|
|||
...
|
||||
|
||||
async def finish(self,
|
||||
msgchain,
|
||||
msgchain=None,
|
||||
quote=True,
|
||||
disable_secret_check=False):
|
||||
"""
|
||||
|
@ -76,7 +76,9 @@ class MessageSession:
|
|||
:return: 被发送的消息链
|
||||
"""
|
||||
...
|
||||
f = await self.sendMessage(msgchain, disable_secret_check=disable_secret_check, quote=quote)
|
||||
f = None
|
||||
if msgchain is not None:
|
||||
f = await self.sendMessage(msgchain, disable_secret_check=disable_secret_check, quote=quote)
|
||||
raise FinishedException(f)
|
||||
|
||||
async def sendDirectMessage(self, msgchain, disable_secret_check=False):
|
||||
|
|
|
@ -100,7 +100,7 @@ async def result(msg: MessageSession):
|
|||
err = msg.parsed_msg['<errcode>']
|
||||
err = results.fixup_input(err)
|
||||
if (meme := results.check_meme(err)) is not None:
|
||||
return await msg.finish(meme)
|
||||
await msg.finish(meme)
|
||||
try:
|
||||
ret = results.fetch(err)
|
||||
except ValueError:
|
||||
|
|
|
@ -30,6 +30,7 @@ async def main(msg: MessageSession):
|
|||
if msg.Feature.delete and not enabled_addon:
|
||||
await msg.sleep(90)
|
||||
await send.delete()
|
||||
await msg.finish()
|
||||
|
||||
|
||||
async def s(msg: MessageSession, address, raw, showplayer, mode, enabled_addon):
|
||||
|
@ -44,4 +45,5 @@ async def s(msg: MessageSession, address, raw, showplayer, mode, enabled_addon):
|
|||
if msg.Feature.delete and not enabled_addon:
|
||||
await msg.sleep(90)
|
||||
await send.delete()
|
||||
await msg.finish()
|
||||
return sendmsg
|
||||
|
|
|
@ -531,7 +531,10 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
await session.sendMessage(f'发生错误:' + str(e))
|
||||
if isinstance(session, MessageSession):
|
||||
if msg_list:
|
||||
await session.sendMessage(msg_list)
|
||||
if not all([not render_infobox_list, not render_section_list, not dl_list, not wait_list]):
|
||||
await session.finish(msg_list)
|
||||
else:
|
||||
await session.sendMessage(msg_list)
|
||||
if render_infobox_list and session.Feature.image:
|
||||
infobox_msg_list = []
|
||||
for i in render_infobox_list:
|
||||
|
@ -541,6 +544,9 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
infobox_msg_list.append(Image(get_infobox))
|
||||
if infobox_msg_list:
|
||||
await session.finish(infobox_msg_list, quote=False)
|
||||
else:
|
||||
if all([not render_section_list, not dl_list, not wait_list]):
|
||||
await session.finish()
|
||||
if render_section_list and session.Feature.image:
|
||||
section_msg_list = []
|
||||
for i in render_section_list:
|
||||
|
@ -550,6 +556,9 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
section_msg_list.append(Image(get_section))
|
||||
if section_msg_list:
|
||||
await session.finish(section_msg_list, quote=False)
|
||||
else:
|
||||
if all([not dl_list, not wait_list]):
|
||||
await session.finish()
|
||||
if dl_list:
|
||||
for f in dl_list:
|
||||
dl = await download_to_cache(f)
|
||||
|
@ -562,9 +571,11 @@ async def query_pages(session: Union[MessageSession, QueryInfo], title: Union[st
|
|||
if session.Feature.voice:
|
||||
await session.finish(Voice(dl), quote=False)
|
||||
if wait_msg_list and session.Feature.wait:
|
||||
confirm = await session.finish(wait_msg_list)
|
||||
confirm = await session.waitConfirm(wait_msg_list)
|
||||
if confirm and wait_list:
|
||||
await query_pages(session, wait_list, use_prefix=False)
|
||||
else:
|
||||
await session.finish()
|
||||
else:
|
||||
return {'msg_list': msg_list, 'web_render_list': render_infobox_list, 'dl_list': dl_list,
|
||||
'wait_list': wait_list, 'wait_msg_list': wait_msg_list}
|
||||
|
|
Reference in a new issue