优化原神日历和60秒读世界*4(怎么漏这漏那的..

This commit is contained in:
CMHopeSunshine 2022-05-29 13:02:49 +08:00
parent 81f36d0a26
commit 6e3396a064
2 changed files with 20 additions and 8 deletions

View File

@ -103,10 +103,11 @@ async def _(event: MessageEvent, msg: Message = CommandArg()):
await calendar.finish('请给出正确的时间格式为12:00', at_sender=True) await calendar.finish('请给出正确的时间格式为12:00', at_sender=True)
# 关闭推送功能 # 关闭推送功能
elif msg.startswith(('关闭', 'off', 'close')): elif msg.startswith(('关闭', 'off', 'close')):
if str(get_message_id(event)) in push_data:
del push_data[str(get_message_id(event))] del push_data[str(get_message_id(event))]
if scheduler.get_job("genshin_calendar_" + str(get_message_id(event))): if scheduler.get_job("genshin_calendar_" + str(get_message_id(event))):
scheduler.remove_job("genshin_calendar_" + str(get_message_id(event))) scheduler.remove_job("genshin_calendar_" + str(get_message_id(event)))
save_json('calender_push.json') save_json(push_data, 'calender_push.json')
await calendar.finish('原神日程推送已关闭', at_sender=True) await calendar.finish('原神日程推送已关闭', at_sender=True)
elif msg.startswith(('状态', 'status', 'setting')): elif msg.startswith(('状态', 'status', 'setting')):
if str(get_message_id(event)) not in push_data: if str(get_message_id(event)) not in push_data:
@ -115,6 +116,7 @@ async def _(event: MessageEvent, msg: Message = CommandArg()):
reply_msg = f'原神日历订阅:\n' reply_msg = f'原神日历订阅:\n'
reply_msg += f'推送时间: {push_data[str(get_message_id(event))]["hour"]}:{push_data[str(get_message_id(event))]["minute"]:02d}\n' reply_msg += f'推送时间: {push_data[str(get_message_id(event))]["hour"]}:{push_data[str(get_message_id(event))]["minute"]:02d}\n'
reply_msg += f'服务器: {" ".join(push_data[str(get_message_id(event))]["server_list"])}' reply_msg += f'服务器: {" ".join(push_data[str(get_message_id(event))]["server_list"])}'
await calendar.finish(reply_msg, at_sender=True)
else: else:
await calendar.finish('指令错误') await calendar.finish('指令错误')

View File

@ -50,11 +50,21 @@ async def news60s_pic_handler(event: MessageEvent, msg: Message = CommandArg()):
await news60s_pic.finish('请给出正确的时间格式为12:00', at_sender=True) await news60s_pic.finish('请给出正确的时间格式为12:00', at_sender=True)
elif msg.startswith(('关闭', 'off', 'close')): elif msg.startswith(('关闭', 'off', 'close')):
push_data = load_json('news60s_push.json') push_data = load_json('news60s_push.json')
if str(get_message_id(event)) in push_data:
del push_data[str(get_message_id(event))] del push_data[str(get_message_id(event))]
if scheduler.get_job('60sNews' + str(get_message_id(event))): if scheduler.get_job('60sNews' + str(get_message_id(event))):
scheduler.remove_job('60sNews' + str(get_message_id(event))) scheduler.remove_job('60sNews' + str(get_message_id(event)))
save_json(push_data, 'news60s_push.json') save_json(push_data, 'news60s_push.json')
await news60s_pic.finish('关闭60s读世界推送成功', at_sender=True) await news60s_pic.finish('关闭60s读世界推送成功', at_sender=True)
elif msg.startswith(('状态', 'status', 'setting')):
push_data = load_json('news60s_push.json')
if str(get_message_id(event)) not in push_data:
await news60s_pic.finish('当前会话未开启60秒读世界订阅', at_sender=True)
else:
reply_msg = f'60秒读世界订阅时间: {push_data[str(get_message_id(event))]["hour"]}:{push_data[str(get_message_id(event))]["minute"]:02d}'
await news60s_pic.finish(reply_msg, at_sender=True)
else:
await news60s_pic.finish('指令错误')
async def news60s_push_task(push_id, push_data: dict): async def news60s_push_task(push_id, push_data: dict):