From 69f7f989fb46d8ebfb472a931713dccfcb329f24 Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Sat, 17 Aug 2024 12:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BD=BF=E7=94=A8`gsuid=5Fcore.?=
 =?UTF-8?q?utils.sign`=E8=BF=9B=E8=A1=8C=E7=BB=9F=E4=B8=80=E7=AD=BE?=
 =?UTF-8?q?=E5=88=B0=20(#642)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GenshinUID/genshinuid_signin/__init__.py      | 78 +++----------------
 .../{sign.py => deprecated_sign.py}           |  0
 2 files changed, 12 insertions(+), 66 deletions(-)
 rename GenshinUID/genshinuid_signin/{sign.py => deprecated_sign.py} (100%)

diff --git a/GenshinUID/genshinuid_signin/__init__.py b/GenshinUID/genshinuid_signin/__init__.py
index d4ffbb26..c4a3eb01 100644
--- a/GenshinUID/genshinuid_signin/__init__.py
+++ b/GenshinUID/genshinuid_signin/__init__.py
@@ -1,16 +1,13 @@
-import random
-import asyncio
-
 from gsuid_core.sv import SV
 from gsuid_core.bot import Bot
-from gsuid_core.gss import gss
 from gsuid_core.models import Event
 from gsuid_core.aps import scheduler
 from gsuid_core.logger import logger
 from gsuid_core.utils.error_reply import UID_HINT
 from gsuid_core.utils.database.models import GsBind
+from gsuid_core.utils.sign.sign import sign_in, daily_sign
+from gsuid_core.utils.boardcast.send_msg import send_board_cast_msg
 
-from .sign import sign_in, daily_sign
 from ..genshinuid_config.gs_config import gsconfig
 
 SIGN_TIME = gsconfig.get_config('SignTime').data
@@ -30,78 +27,27 @@ async def sign_at_night():
 # 群聊内 签到 功能
 @sv_sign.on_fullmatch('签到')
 async def get_sign_func(bot: Bot, ev: Event):
-    await bot.logger.info('[签到]QQ号: {}'.format(ev.user_id))
+    await bot.logger.info('[原神] [签到]QQ号: {}'.format(ev.user_id))
     uid = await GsBind.get_uid_by_game(ev.user_id, ev.bot_id)
     if uid is None:
         return await bot.send(UID_HINT)
-    await bot.logger.info('[签到]UID: {}'.format(uid))
-    await bot.send(await sign_in(uid))
+    await bot.logger.info('[原神] [签到]UID: {}'.format(uid))
+    await bot.send(await sign_in(uid, 'gs'))
 
 
 @sv_sign_config.on_fullmatch('全部重签')
 async def recheck(bot: Bot, ev: Event):
     await bot.logger.info('开始执行[全部重签]')
-    await bot.send('已开始执行')
+    await bot.send('[原神] [全部重签] 已开始执行...')
     await send_daily_sign()
-    await bot.send('执行完成')
+    await bot.send('[原神] [全部重签] 执行完成！')
 
 
 async def send_daily_sign():
-    logger.info('开始执行[每日全部签到]')
+    logger.info('[原神] 开始执行[每日全部签到]')
     # 执行签到 并获得推送消息
-    result = await daily_sign()
-    private_msg_list = result['private_msg_list']
-    group_msg_list = result['group_msg_list']
-    logger.info('[每日全部签到]完成')
-
+    result = await daily_sign('gs')
     if not IS_REPORT:
-        return
-
-    # 执行私聊推送
-    for qid in private_msg_list:
-        try:
-            for bot_id in gss.active_bot:
-                for single in private_msg_list[qid]:
-                    await gss.active_bot[bot_id].target_send(
-                        single['msg'], 'direct', qid, single['bot_id'], '', ''
-                    )
-        except Exception as e:
-            logger.warning(
-                f'[每日全部签到] QQ {qid} 私聊推送失败!错误信息:{e}'
-            )
-        await asyncio.sleep(0.5)
-    logger.info('[每日全部签到]私聊推送完成')
-
-    # 执行群聊推送
-    for gid in group_msg_list:
-        # 根据succee数判断是否为简洁推送
-        if group_msg_list[gid]['success'] >= 0:
-            report = (
-                '以下为签到失败报告：{}'.format(
-                    group_msg_list[gid]['push_message']
-                )
-                if group_msg_list[gid]['push_message'] != ''
-                else ''
-            )
-            msg_title = '今日自动签到已完成！\n本群共签到成功{}人，共签到失败{}人。{}'.format(
-                group_msg_list[gid]['success'],
-                group_msg_list[gid]['failed'],
-                report,
-            )
-        else:
-            msg_title = group_msg_list[gid]['push_message']
-        # 发送群消息
-        try:
-            for bot_id in gss.active_bot:
-                await gss.active_bot[bot_id].target_send(
-                    msg_title,
-                    'group',
-                    gid,
-                    group_msg_list[gid]['bot_id'],
-                    '',
-                    '',
-                )
-        except Exception as e:
-            logger.warning(f'[每日全部签到]群 {gid} 推送失败!错误信息:{e}')
-        await asyncio.sleep(0.5 + random.randint(1, 3))
-    logger.info('[每日全部签到]群聊推送完成')
+        result['private_msg_dict'] = {}
+    await send_board_cast_msg(result)
+    logger.info('[原神] [每日全部签到]群聊推送完成')
diff --git a/GenshinUID/genshinuid_signin/sign.py b/GenshinUID/genshinuid_signin/deprecated_sign.py
similarity index 100%
rename from GenshinUID/genshinuid_signin/sign.py
rename to GenshinUID/genshinuid_signin/deprecated_sign.py