From ba29232c9f4da9ece28f27147a8374b31802fcb3 Mon Sep 17 00:00:00 2001
From: AkashiCoin <55268546+AkashiCoin@users.noreply.github.com>
Date: Sun, 3 Oct 2021 20:17:08 +0800
Subject: [PATCH 1/3] Update __init__.py

---
 plugins/epic/__init__.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/epic/__init__.py b/plugins/epic/__init__.py
index d689b44e..9b252630 100644
--- a/plugins/epic/__init__.py
+++ b/plugins/epic/__init__.py
@@ -23,9 +23,7 @@ __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)
 
@@ -35,7 +33,7 @@ async def handle(bot: Bot, event: Event, state: T_State):
     msg_list = []
     msg_list, code = await get_Epicfree(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:
@@ -58,13 +56,13 @@ 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_Epicfree(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, maessage=msg_list)
             except Exception as e:
                 logger.error(f"GROUP {g} epic免费游戏推送错误 {type(e)}: {e}")

From 2cdf3c28b684ba21a86898dd8da25e949b2d7c3b Mon Sep 17 00:00:00 2001
From: AkashiCoin <55268546+AkashiCoin@users.noreply.github.com>
Date: Sun, 3 Oct 2021 20:35:55 +0800
Subject: [PATCH 2/3] Update __init__.py

---
 plugins/epic/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/epic/__init__.py b/plugins/epic/__init__.py
index 9b252630..711b68fe 100644
--- a/plugins/epic/__init__.py
+++ b/plugins/epic/__init__.py
@@ -38,7 +38,7 @@ async def handle(bot: Bot, event: Event, state: T_State):
         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免费游戏"

From 54025c9cfc9777ea95dd23d7fcdd1d7440e1f0d8 Mon Sep 17 00:00:00 2001
From: HibiKier <45528451+HibiKier@users.noreply.github.com>
Date: Sun, 3 Oct 2021 21:39:03 +0800
Subject: [PATCH 3/3] Update __init__.py

---
 plugins/epic/__init__.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/epic/__init__.py b/plugins/epic/__init__.py
index 711b68fe..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免费游戏"
@@ -29,9 +29,8 @@ 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:
         await epic.send(msg_list)
     elif isinstance(event, GroupMessageEvent):
@@ -58,11 +57,10 @@ async def _():
     for g in gl:
         if await group_manager.check_group_task_status(g, "epic_free_game"):
             try:
-                msg_list = []
-                msg_list, code = await get_Epicfree(bot, GroupMessageEvent)
+                msg_list, code = await get_epic_free(bot, GroupMessageEvent)
                 if code == 200:
                     await bot.send_group_forward_msg(group_id=g, messages=msg_list)
                 else:
-                    await bot.send_group_msg(group_id=g, maessage=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}")