diff --git a/plugins/epic/__init__.py b/plugins/epic/__init__.py index d689b44e..a2fa2c2a 100644 --- a/plugins/epic/__init__.py +++ b/plugins/epic/__init__.py @@ -1,9 +1,9 @@ from nonebot import on_command from services.log import logger -from nonebot.adapters.cqhttp import Bot, Event, MessageEvent, GroupMessageEvent +from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent from nonebot.typing import T_State from utils.utils import scheduler, get_bot -from .data_source import get_Epicfree +from .data_source import get_epic_free from utils.manager import group_manager __zx_plugin_name__ = "epic免费游戏" @@ -23,24 +23,21 @@ __plugin_settings__ = { "limit_superuser": False, "cmd": ["epic"], } -__plugin_task__ = { - 'epic_free_game': 'epic免费游戏' -} +__plugin_task__ = {"epic_free_game": "epic免费游戏"} epic = on_command("epic", priority=5, block=True) @epic.handle() -async def handle(bot: Bot, event: Event, state: T_State): - msg_list = [] - msg_list, code = await get_Epicfree(bot, event) +async def handle(bot: Bot, event: MessageEvent, state: T_State): + msg_list, code = await get_epic_free(bot, event) if code == 404: - epic.finish(msg_list) + await epic.send(msg_list) elif isinstance(event, GroupMessageEvent): await bot.send_group_forward_msg(group_id=event.group_id, messages=msg_list) else: for msg in msg_list: - await epic.send(msg) + await bot.send_private_msg(user_id=event.user_id, message=msg) logger.info( f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})" f" 获取epic免费游戏" @@ -58,13 +55,12 @@ async def _(): gl = await bot.get_group_list() gl = [g["group_id"] for g in gl] for g in gl: - if await group_manager.check_group_task_status(g, 'epic_free_game'): + if await group_manager.check_group_task_status(g, "epic_free_game"): try: - msg_list = [] - msg_list, code = await get_Epicfree_Group(bot, event) + msg_list, code = await get_epic_free(bot, GroupMessageEvent) if code == 200: - await bot.send_group_forward_msg(group_id=event.group_id, messages=msg_list) + await bot.send_group_forward_msg(group_id=g, messages=msg_list) else: - epic.finish(msg_list) + await bot.send_group_msg(group_id=g, message=msg_list) except Exception as e: logger.error(f"GROUP {g} epic免费游戏推送错误 {type(e)}: {e}")