Merge pull request #59 from AkashiCoin/main

epic
This commit is contained in:
HibiKier 2021-10-03 21:40:12 +08:00 committed by GitHub
commit 22676f3bfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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