update

plugins/draw_card/__init__.py

@@ -1,29 +1,33 @@
 from nonebot import on_regex, on_keyword
-from nonebot.adapters.cqhttp import Bot, MessageEvent
+from nonebot.adapters.cqhttp import Bot, MessageEvent, Message
 from nonebot.permission import SUPERUSER
 from nonebot.typing import T_State
-from services.log import logger
-from util.utils import scheduler
-import re
-from .genshin_handle import genshin_draw, update_genshin_info, reset_count
-from .prts_handle import update_prts_info, prts_draw, reload_pool
+from .genshin_handle import genshin_draw, update_genshin_info, reset_count, reload_genshin_pool
+from .prts_handle import update_prts_info, prts_draw, reload_prts_pool
 from .pretty_handle import update_pretty_info, pretty_draw
 from .guardian_handle import update_guardian_info, guardian_draw
 from .pcr_handle import update_pcr_info, pcr_draw
+from .azur_handle import update_azur_info, azur_draw
+from .fgo_handle import update_fgo_info, fgo_draw
+from .onmyoji_handle import update_onmyoji_info, onmyoji_draw
 from .update_game_info import update_info
-from .util import check_num
+from .util import is_number, check_num
 from .rule import is_switch
-from .config import PRTS_FLAG, PRETTY_FLAG, GUARDIAN_FLAG, GENSHIN_FLAG, PCR_FLAG
-
-
+from .config import PRTS_FLAG, PRETTY_FLAG, GUARDIAN_FLAG, GENSHIN_FLAG, PCR_FLAG, AZUR_FLAG, FGO_FLAG, ONMYOJI_FLAG
+from .async_update_game_info import async_update_game
+import re
+import asyncio
+from util.utils import scheduler
+from services.log import logger
 
 prts = on_regex(r'.*?方舟[1-9|一][0-9]{0,2}[抽|井]', rule=is_switch('prts'), priority=5, block=True)
 prts_update = on_keyword({'更新方舟信息', '更新明日方舟信息'}, permission=SUPERUSER, priority=1, block=True)
-prts_reload = on_keyword({'重载方舟卡池'}, priority=1, block=True)
+prts_up_reload = on_keyword({'重载方舟卡池'}, priority=1, block=True)
 
-genshin = on_regex('.*?原神[1-9|一][0-9]{0,2}[抽|井]', rule=is_switch('genshin'), priority=5, block=True)
-genshin_reset = on_keyword({'重置原神抽卡'}, priority=1, block=True)
+genshin = on_regex('.*?原神(武器|角色)?池?[1-9|一][0-9]{0,2}[抽|井]', rule=is_switch('genshin'), priority=5, block=True)
 genshin_update = on_keyword({'更新原神信息'}, permission=SUPERUSER, priority=1, block=True)
+genshin_reset = on_keyword({'重置原神抽卡'}, priority=1, block=True)
+genshin_up_reload = on_keyword({'重载原神卡池'}, priority=1, block=True)
 
 pretty = on_regex('.*?马娘卡?[1-9|一][0-9]{0,2}[抽|井]', rule=is_switch('pretty'), priority=5, block=True)
 pretty_update = on_keyword({'更新马娘信息', '更新赛马娘信息'}, permission=SUPERUSER, priority=1, block=True)
@@ -31,15 +35,17 @@ pretty_update = on_keyword({'更新马娘信息', '更新赛马娘信息'}, perm
 guardian = on_regex('.*?坎公骑冠剑武?器?[1-9|一][0-9]{0,2}[抽|井]', rule=is_switch('guardian'), priority=5, block=True)
 guardian_update = on_keyword({'更新坎公骑冠剑信息'}, permission=SUPERUSER, priority=1, block=True)
 
-pcr = on_regex('.*?(pcr|公主连结|公主连接|公主链接)[1-9|一][0-9]{0,2}[抽|井]', rule=is_switch('pcr'), priority=5, block=True)
+pcr = on_regex('.*?(pcr|公主连结|公主连接|公主链接|公主焊接)[1-9|一][0-9]{0,2}[抽|井]', rule=is_switch('pcr'), priority=5, block=True)
 pcr_update = on_keyword({'更新pcr信息', '更新公主连结信息'}, permission=SUPERUSER, priority=1, block=True)
 
-test = on_keyword({'test'}, permission=SUPERUSER, priority=1, block=True)
+azur = on_regex('.*?碧蓝航?线?(轻型|重型|特型)池?[1-9|一][0-9]{0,2}[抽]', rule=is_switch('azur'), priority=5, block=True)
+azur_update = on_keyword({'更新碧蓝信息', '更新碧蓝航线信息'}, permission=SUPERUSER, priority=1, block=True)
 
+fgo = on_regex('.*?fgo[1-9|一][0-9]{0,2}[抽]', rule=is_switch('fgo'), priority=5, block=True)
+fgo_update = on_keyword({'更新fgo信息'}, permission=SUPERUSER, priority=1, block=True)
 
-@test.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    await update_pcr_info()
+onmyoji = on_regex('.*?阴阳师[1-9|一][0-9]{0,2}[抽]', rule=is_switch('onmyoji'), priority=5, block=True)
+onmyoji_update = on_keyword({'更新阴阳师信息'}, permission=SUPERUSER, priority=1, block=True)
 
 
 @prts.handle()
@@ -56,28 +62,46 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
         else:
             return
     await prts.send(await prts_draw(int(num)), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) 方舟 {num}抽")
 
 
-@prts_reload.handle()
+@prts_up_reload.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
-    await reload_pool()
-    await prts_reload.finish('重载完成！')
+    text = await reload_prts_pool()
+    await prts_up_reload.finish(Message(f'重载完成！\n{text}'))
 
 
 @genshin.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     msg = str(event.get_message()).strip()
-    if msg in ['原神一井', '原神1井']:
-        num = 180
-    else:
-        rmsg = re.search(r'.*?原神(.*)抽', msg)
-        if rmsg:
-            num, flag = check_num(rmsg.group(1), 180)
+    rmsg = re.search(r'.*?原神(武器|角色)?池?(.*)[抽|井]', msg)
+    if rmsg:
+        pool_name = rmsg.group(1)
+        if pool_name == '武器':
+            pool_name = 'arms'
+        elif pool_name == '角色':
+            pool_name = 'char'
+        else:
+            pool_name = ''
+        num = rmsg.group(2)
+        if msg.find('一井') != -1 or msg.find('1井') != -1:
+            num = 180
+        else:
+            num, flag = check_num(num, 180)
             if not flag:
                 await genshin.finish(num, at_sender=True)
-        else:
-            return
-    await genshin.send(await genshin_draw(event.user_id, int(num)), at_sender=True)
+    else:
+        return
+    await genshin.send(await genshin_draw(event.user_id, int(num), pool_name), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) 原神 {num}抽")
+
+
+@genshin_up_reload.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    text = await reload_genshin_pool()
+    await genshin_reset.finish(Message(f'重载成功！\n{text}'))
 
 
 @genshin_reset.handle()
@@ -110,6 +134,8 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
         else:
             return
     await pretty.send(await pretty_draw(int(num), pool_name), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) 赛马娘 {num}抽")
 
 
 @guardian.handle()
@@ -133,6 +159,8 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
         else:
             return
     await guardian.send(await guardian_draw(int(num), pool_name), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) 坎公骑冠剑 {num}抽")
 
 
 @pcr.handle()
@@ -149,12 +177,59 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
         else:
             return
     await pcr.send(await pcr_draw(int(num)), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) 公主连结 {num}抽")
+
+
+@azur.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = str(event.get_message()).strip()
+    rmsg = re.search('.*?碧蓝航?线?(轻型|重型|特型)池?(.*)[抽]', msg)
+    if rmsg:
+        pool_name = rmsg.group(1)
+        num, flag = check_num(rmsg.group(2), 300)
+        if not flag:
+            await azur.finish(num, at_sender=True)
+    else:
+        return
+    await azur.send(await azur_draw(int(num), pool_name), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) 碧蓝航线 {num}抽")
+
+
+@fgo.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = str(event.get_message()).strip()
+    rmsg = re.search('.*?fgo(.*)抽', msg)
+    if rmsg:
+        num, flag = check_num(rmsg.group(1), 300)
+        if not flag:
+            await fgo.finish(num, at_sender=True)
+    else:
+        return
+    await fgo.send(await fgo_draw(int(num)), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) fgo {num}抽")
+
+
+@onmyoji.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    msg = str(event.get_message()).strip()
+    rmsg = re.search('.*?阴阳师(.*)抽', msg)
+    if rmsg:
+        num, flag = check_num(rmsg.group(1), 300)
+        if not flag:
+            await onmyoji.finish(num, at_sender=True)
+    else:
+        return
+    await onmyoji.send(await onmyoji_draw(int(num)), at_sender=True)
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if event.message_type != 'private' else 'private'}) 阴阳师 {num}抽")
 
 
 @prts_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_prts_info()
-    await reload_pool()
     await prts_update.finish('更新完成！')
 
 
@@ -182,6 +257,24 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     await genshin_update.finish('更新完成！')
 
 
+@azur_update.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    await update_azur_info()
+    await genshin_update.finish('更新完成！')
+
+
+@fgo_update.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    await update_fgo_info()
+    await genshin_update.finish('更新完成！')
+
+
+@onmyoji_update.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    await update_onmyoji_info()
+    await genshin_update.finish('更新完成！')
+
+
 # 更新资源
 @scheduler.scheduled_job(
     'cron',
@@ -189,34 +282,28 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     minute=1,
 )
 async def _():
-    try:
-        if PRTS_FLAG:
-            await update_prts_info()
-    except Exception as e:
-        logger.error(f'draw_card: 更新 明日方舟 失败 e：{e}')
-    try:
-        if GENSHIN_FLAG:
-            await update_genshin_info()
-    except Exception as e:
-        logger.error(f'draw_card: 更新 原神 失败 e：{e}')
-    try:
-        if PRETTY_FLAG:
-            await update_pretty_info()
-    except Exception as e:
-        logger.error(f'draw_card: 更新 赛马娘 失败 e：{e}')
-    try:
-        if GUARDIAN_FLAG:
-            await update_guardian_info()
-    except Exception as e:
-        logger.error(f'draw_card: 更新 坎公骑冠剑 失败 e：{e}')
-    try:
-        if PCR_FLAG:
-            await update_pcr_info()
-    except Exception as e:
-        logger.error(f'draw_card: 更新 公主连结 失败 e：{e}')
+    tasks = []
+    if PRTS_FLAG:
+        tasks.append(asyncio.ensure_future(update_prts_info()))
+    if GENSHIN_FLAG:
+        tasks.append(asyncio.ensure_future(update_genshin_info()))
+    if PRETTY_FLAG:
+        tasks.append(asyncio.ensure_future(update_pretty_info()))
+    if GUARDIAN_FLAG:
+        tasks.append(asyncio.ensure_future(update_guardian_info()))
+    if PCR_FLAG:
+        tasks.append(asyncio.ensure_future(update_pcr_info()))
+    if AZUR_FLAG:
+        tasks.append(asyncio.ensure_future(update_azur_info()))
+    if FGO_FLAG:
+        tasks.append(asyncio.ensure_future(update_fgo_info()))
+    if ONMYOJI_FLAG:
+        tasks.append(asyncio.ensure_future(update_onmyoji_info()))
+    await asyncio.gather(*tasks)
+    logger.info('draw_card 抽卡自动更新完成...')
 
 
-# 每天四点重载up卡池
+# 每天四点重载方舟up卡池
 @scheduler.scheduled_job(
     'cron',
     hour=4,
@@ -224,5 +311,19 @@ async def _():
 )
 async def _():
     if PRTS_FLAG:
-        await reload_pool()
-        logger.info(f'draw_card: 04: 01 重载方舟卡池')
+        await reload_prts_pool()
+        logger.info('自动重载方舟卡池UP成功')
+
+
+# 每天下午六点点重载原神up卡池
+@scheduler.scheduled_job(
+    'cron',
+    hour=18,
+    minute=1,
+)
+async def _():
+    if PRTS_FLAG:
+        await reload_genshin_pool()
+        logger.info('自动重载原神卡池UP成功')
+
+