Genshin-bots/GenshinUID
1
0
Fork 0
mirror of https://github.com/KimigaiiWuyi/GenshinUID.git synced 2025-06-01 13:09:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Wuyi无疑 2022-03-28 00:08:23 +08:00
parent dbe8ebf6bc
commit d652a96f9e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
genshinuid.py
View File

@ -45,14 +45,14 @@ async def send_audio(bot: HoshinoBot, ev: CQEvent):
name = ''.join(re.findall('[\u4e00-\u9fa5]', message)) name = ''.join(re.findall('[\u4e00-\u9fa5]', message))
im = await audio_wiki(name, message) im = await audio_wiki(name, message)
if name == "列表": if name == "列表":
await bot.send(ev, f"[CQ:image,file={im}]") await bot.send(ev, MessageSegment.image(im))
else: else:
await bot.send(ev, f"[CQ:recode,file={im}]") await bot.send(ev, MessageSegment.record(im))
except ActionFailed as e: except ActionFailed as e:
logger.exception("获取语音失败") logger.exception("获取语音失败")
await bot.send(ev, "机器人发送消息失败：{}".format(e)) await bot.send(ev, "机器人发送消息失败：{}".format(e))
except Exception as e: except Exception as e:
logger.exception("获取语音失败") logger.exception("获取语音失败或ffmpeg未配置")
await bot.send(ev, "发生错误 {},请检查后台输出。".format(e)) await bot.send(ev, "发生错误 {},请检查后台输出。".format(e))
@ -66,11 +66,10 @@ async def send_polar(bot: HoshinoBot, ev: CQEvent):
ls_f = base64.b64encode(f.read()).decode() ls_f = base64.b64encode(f.read()).decode()
img_mihoyo_bbs = 'base64://' + ls_f img_mihoyo_bbs = 'base64://' + ls_f
f.close() f.close()
im = f"[CQ:image,file={img_mihoyo_bbs}]"
break break
else: else:
await draw_event_pic() await draw_event_pic()
await bot.send(ev, im) await bot.send(ev, MessageSegment.image(img_mihoyo_bbs))
except ActionFailed as e: except ActionFailed as e:
await bot.send(ev, "机器人发送消息失败：{}".format(e)) await bot.send(ev, "机器人发送消息失败：{}".format(e))
logger.exception("发送活动列表失败") logger.exception("发送活动列表失败")

6
mihoyo_libs/get_mihoyo_bbs_data.py
View File

@ -312,7 +312,7 @@ async def audio_wiki(name, message):
audioid1 = _audioid audioid1 = _audioid
url = await get_audio_info(name, audioid1) url = await get_audio_info(name, audioid1)
req = requests.get(url) req = requests.get(url)
if req.headers["Content-Type"].startswith("audio"): if req.status_code == 200:
return BytesIO(req.content) return BytesIO(req.content)
else: else:
if _audioid in tmp_json: if _audioid in tmp_json:
@ -322,7 +322,7 @@ async def audio_wiki(name, message):
imgmes = 'base64://' + b64encode(open(os.path.join(INDEX_PATH, "语音.png"), "rb").read()).decode() imgmes = 'base64://' + b64encode(open(os.path.join(INDEX_PATH, "语音.png"), "rb").read()).decode()
return imgmes return imgmes
elif name == "": elif name == "":
return "角色名不正确。" return "请输入角色名。"
else: else:
audioid = re.findall(r"[0-9]+", message)[0] audioid = re.findall(r"[0-9]+", message)[0]
try: try:
@ -332,6 +332,8 @@ async def audio_wiki(name, message):
if audio: if audio:
audios = 'base64://' + b64encode(audio.getvalue()).decode() audios = 'base64://' + b64encode(audio.getvalue()).decode()
return audios return audios
else:
return "没有找到语音，请检查语音ID与角色名是否正确，如无误则可能未收录该语音"
async def artifacts_wiki(name): async def artifacts_wiki(name):