Merge pull request #891 from yajiwa/main

更新微博热搜
This commit is contained in:
HibiKier
2022-07-07 22:01:53 +08:00
committed by GitHub
+5 -3
View File
@@ -40,19 +40,21 @@ wbtop_data = []
async def _(event: MessageEvent, arg: Message = CommandArg()): async def _(event: MessageEvent, arg: Message = CommandArg()):
global wbtop_data global wbtop_data
msg = arg.extract_plain_text().strip() msg = arg.extract_plain_text().strip()
if not wbtop_data or not msg:
if wbtop_data: if wbtop_data:
now_time = datetime.datetime.now() now_time = datetime.datetime.now()
if now_time > wbtop_data["time"] + datetime.timedelta(minutes=5): if now_time > wbtop_data["time"] + datetime.timedelta(minutes=5):
data, code = await get_wbtop(wbtop_url) data, code = await get_wbtop(wbtop_url)
if code != 200: if code != 200:
await wbtop.finish(data, at_sender=True) await wbtop.finish(data, at_sender=True)
else:
wbtop_data = data wbtop_data = data
else: else:
data, code = await get_wbtop(wbtop_url) data, code = await get_wbtop(wbtop_url)
if code != 200: if code != 200:
await wbtop.finish(data, at_sender=True) await wbtop.finish(data, at_sender=True)
else:
wbtop_data = data wbtop_data = data
if not msg: if not msg:
img = await asyncio.get_event_loop().run_in_executor( img = await asyncio.get_event_loop().run_in_executor(
None, gen_wbtop_pic, wbtop_data["data"] None, gen_wbtop_pic, wbtop_data["data"]
@@ -72,7 +74,7 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
wait_time=12 wait_time=12
) )
if img: if img:
await wbtop.send(img) await wbtop.finish(img)
else: else:
await wbtop.send("发生了一些错误.....") await wbtop.finish("发生了一些错误.....")