fit nonebot.beta2

plugins/draw_card/__init__.py

@@ -1,16 +1,13 @@
 from nonebot import on_regex, on_keyword
-from nonebot.adapters.cqhttp import Bot, MessageEvent, Message, GroupMessageEvent
+from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message
 from nonebot.permission import SUPERUSER
 from nonebot.typing import T_State
-from .genshin_handle import (
-    genshin_draw,
-    update_genshin_info,
-    reset_count,
-    reload_genshin_pool,
-)
+from nonebot.params import RegexGroup
+from utils.utils import scheduler
+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, reload_pretty_pool
-from .guardian_handle import update_guardian_info, guardian_draw
+from .guardian_handle import update_guardian_info, guardian_draw, reload_guardian_pool
 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
@@ -18,21 +15,12 @@ from .onmyoji_handle import update_onmyoji_info, onmyoji_draw
 from .update_game_info import update_info
 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,
-    AZUR_FLAG,
-    FGO_FLAG,
-    ONMYOJI_FLAG,
-)
+from .config import draw_config
 from .async_update_game_info import async_update_game
+from typing import Tuple, Any
 import re
 import asyncio
-from utils.utils import scheduler
-from services.log import logger
+
 
 __zx_plugin_name__ = "游戏抽卡"
 __plugin_usage__ = """
@@ -101,81 +89,44 @@ __plugin_settings__ = {
     "cmd": ["游戏抽卡", "抽卡"],
 }
 
+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_up_reload = on_keyword({'重载方舟卡池'}, priority=1, block=True)
 
-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_up_reload = on_keyword({"重载方舟卡池"}, priority=1, block=True)
+genshin = on_regex(r'.*?原神(武器|角色)?池?[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)
 
-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(r'.*?马娘卡?[1-9|一][0-9]{0,2}[抽|井|连]', rule=is_switch('pretty'), priority=5, block=True)
+pretty_update = on_keyword({'更新马娘信息', '更新赛马娘信息'}, permission=SUPERUSER, priority=1, block=True)
+pretty_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
-)
-pretty_up_reload = on_keyword({"重载赛马娘卡池"}, priority=1, block=True)
+guardian = on_regex(r'.*?坎公骑冠剑武?器?[1-9|一][0-9]{0,2}[抽|井|连]', rule=is_switch('guardian'), priority=5, block=True)
+guardian_update = on_keyword({'更新坎公骑冠剑信息'}, permission=SUPERUSER, priority=1, block=True)
+guardian_up_reload = on_keyword({'重载坎公骑冠剑卡池'}, priority=1, block=True)
 
-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(r'.*?(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)
 
-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
-)
+azur = on_regex(r'.*?碧蓝航?线?(轻型|重型|特型)池?[1-9|一][0-9]{0,2}[抽|连]', rule=is_switch('azur'), priority=5, block=True)
+azur_update = on_keyword({'更新碧蓝信息', '更新碧蓝航线信息'}, 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(r'.*?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)
 
-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)
-
-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)
+onmyoji = on_regex(r'.*?阴阳师[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()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
+async def _(bot: Bot, event: MessageEvent, state: T_State, reg: Tuple[Any, ...] = RegexGroup()):
     msg = str(event.get_message()).strip()
-    if msg in ["方舟一井", "方舟1井"]:
+    print(reg)
+    if msg in ['方舟一井', '方舟1井']:
         num = 300
     else:
-        rmsg = re.search(r".*?方舟(.*)抽", msg)
+        rmsg = re.search(r'.*?方舟(.*)[抽|连]', msg)
         if rmsg:
             num, flag = check_num(rmsg.group(1), 300)
             if not flag:
@@ -183,31 +134,28 @@ 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 isinstance(event, GroupMessageEvent) else 'private'}) 方舟 {num}抽"
-    )
 
 
 @prts_up_reload.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     text = await reload_prts_pool()
-    await prts_up_reload.finish(Message(f"重载完成！\n{text}"))
+    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()
-    rmsg = re.search(r".*?原神(武器|角色)?池?(.*)[抽|井]", msg)
+    rmsg = re.search(r'.*?原神(武器|角色)?池?(.*)[抽|井|连]', msg)
     if rmsg:
         pool_name = rmsg.group(1)
-        if pool_name == "武器":
-            pool_name = "arms"
-        elif pool_name == "角色":
-            pool_name = "char"
+        if pool_name == '武器':
+            pool_name = 'arms'
+        elif pool_name == '角色':
+            pool_name = 'char'
         else:
-            pool_name = ""
+            pool_name = ''
         num = rmsg.group(2)
-        if msg.find("一井") != -1 or msg.find("1井") != -1:
+        if msg.find('一井') != -1 or msg.find('1井') != -1:
             num = 180
         else:
             num, flag = check_num(num, 180)
@@ -215,94 +163,89 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
                 await genshin.finish(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 isinstance(event, GroupMessageEvent) else 'private'}) 原神 {num}抽"
-    )
+    await genshin.send(await genshin_draw(event.user_id, int(num), pool_name), at_sender=True)
 
 
 @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}"))
+    await genshin_reset.finish(Message(f'重载成功！\n{text}'))
 
 
 @genshin_reset.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     reset_count(event.user_id)
-    await genshin_reset.send("重置了原神抽卡次数", at_sender=True)
+    await genshin_reset.send('重置了原神抽卡次数', at_sender=True)
 
 
 @pretty.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     msg = str(event.get_message()).strip()
-    if msg.find("1井") != -1 or msg.find("一井") != -1:
+    if msg.find('1井') != -1 or msg.find('一井') != -1:
         num = 200
         if msg.find("卡") == -1:
-            pool_name = "char"
+            pool_name = 'char'
         else:
-            pool_name = "card"
+            pool_name = 'card'
     else:
-        rmsg = re.search(r".*?马娘(.*)抽", msg)
+        rmsg = re.search(r'.*?马娘(.*)[抽|连]', msg)
         if rmsg:
             num = rmsg.group(1)
-            if num[0] == "卡":
+            if num[0] == '卡':
                 num = num[1:]
-                pool_name = "card"
+                pool_name = 'card'
             else:
-                pool_name = "char"
+                pool_name = 'char'
             num, flag = check_num(num, 200)
             if not flag:
                 await pretty.finish(num, at_sender=True)
         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 isinstance(event, GroupMessageEvent) else 'private'}) 赛马娘 {num}抽"
-    )
 
 
 @pretty_up_reload.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     text = await reload_pretty_pool()
-    await genshin_reset.finish(Message(f"重载成功！\n{text}"))
+    await genshin_reset.finish(Message(f'重载成功！\n{text}'))
 
 
 @guardian.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     msg = str(event.get_message()).strip()
-    pool_name = "char"
-    if msg.find("1井") != -1 or msg.find("一井") != -1:
+    pool_name = 'char'
+    if msg.find('1井') != -1 or msg.find('一井') != -1:
         num = 300
-        if msg.find("武器") != -1:
-            pool_name = "arms"
+        if msg.find('武器') != -1:
+            pool_name = 'arms'
     else:
-        rmsg = re.search(r".*?坎公骑冠剑(.*)抽", msg)
+        rmsg = re.search(r'.*?坎公骑冠剑(.*)[抽|连]', msg)
         if rmsg:
             num = rmsg.group(1)
-            if num.find("武器") != -1:
-                pool_name = "arms"
-                num = num.replace("武器", "")
+            if num.find('武器') != -1:
+                pool_name = 'arms'
+                num = num.replace('武器', '')
             num, flag = check_num(num, 300)
             if not flag:
                 await guardian.finish(num, at_sender=True)
         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 isinstance(event, GroupMessageEvent) else 'private'}) 坎公骑冠剑 {num}抽"
-    )
+
+
+@guardian_up_reload.handle()
+async def _(bot: Bot, event: MessageEvent, state: T_State):
+    text = await reload_guardian_pool()
+    await genshin_reset.finish(Message(f'重载成功！\n{text}'))
 
 
 @pcr.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     msg = str(event.get_message()).strip()
-    if msg.find("1井") != -1 or msg.find("一井") != -1:
+    if msg.find('1井') != -1 or msg.find('一井') != -1:
         num = 300
     else:
-        rmsg = re.search(r".*?(pcr|公主连结)(.*)[抽|井]", msg)
+        rmsg = re.search(r'.*?(pcr|公主连结)(.*)[抽|井|连]', msg)
         if rmsg:
             num, flag = check_num(rmsg.group(2), 300)
             if not flag:
@@ -310,15 +253,12 @@ 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 isinstance(event, GroupMessageEvent) else 'private'}) 公主连结 {num}抽"
-    )
 
 
 @azur.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     msg = str(event.get_message()).strip()
-    rmsg = re.search(".*?碧蓝航?线?(轻型|重型|特型)池?(.*)[抽]", msg)
+    rmsg = re.search(r'.*?碧蓝航?线?(轻型|重型|特型)池?(.*)[抽|连]', msg)
     if rmsg:
         pool_name = rmsg.group(1)
         num, flag = check_num(rmsg.group(2), 300)
@@ -327,15 +267,12 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     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 isinstance(event, GroupMessageEvent) 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)
+    rmsg = re.search(r'.*?fgo(.*)[抽|连]', msg)
     if rmsg:
         num, flag = check_num(rmsg.group(1), 300)
         if not flag:
@@ -343,15 +280,12 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     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 isinstance(event, GroupMessageEvent) 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)
+    rmsg = re.search(r'.*?阴阳师(.*)[抽|连]', msg)
     if rmsg:
         num, flag = check_num(rmsg.group(1), 300)
         if not flag:
@@ -359,118 +293,122 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     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 isinstance(event, GroupMessageEvent) else 'private'}) 阴阳师 {num}抽"
-    )
 
 
 @prts_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_prts_info()
-    await prts_update.finish("更新完成！")
+    await prts_update.finish('更新完成！')
 
 
 @genshin_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_genshin_info()
-    await genshin_update.finish("更新完成！")
+    await genshin_update.finish('更新完成！')
 
 
 @pretty_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_pretty_info()
-    await genshin_update.finish("更新完成！")
+    await genshin_update.finish('更新完成！')
 
 
 @guardian_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_guardian_info()
-    await genshin_update.finish("更新完成！")
+    await genshin_update.finish('更新完成！')
 
 
 @pcr_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_pcr_info()
-    await genshin_update.finish("更新完成！")
+    await genshin_update.finish('更新完成！')
 
 
 @azur_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_azur_info()
-    await genshin_update.finish("更新完成！")
+    await genshin_update.finish('更新完成！')
 
 
 @fgo_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_fgo_info()
-    await genshin_update.finish("更新完成！")
+    await genshin_update.finish('更新完成！')
 
 
 @onmyoji_update.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
     await update_onmyoji_info()
-    await genshin_update.finish("更新完成！")
+    await genshin_update.finish('更新完成！')
 
 
 # 更新资源
 @scheduler.scheduled_job(
-    "cron",
+    'cron',
     hour=4,
     minute=1,
 )
 async def _():
     tasks = []
-    if PRTS_FLAG:
+    if draw_config.PRTS_FLAG:
         tasks.append(asyncio.ensure_future(update_prts_info()))
-    if GENSHIN_FLAG:
+    if draw_config.GENSHIN_FLAG:
         tasks.append(asyncio.ensure_future(update_genshin_info()))
-    if PRETTY_FLAG:
+    if draw_config.PRETTY_FLAG:
         tasks.append(asyncio.ensure_future(update_pretty_info()))
-    if GUARDIAN_FLAG:
+    if draw_config.GUARDIAN_FLAG:
         tasks.append(asyncio.ensure_future(update_guardian_info()))
-    if PCR_FLAG:
+    if draw_config.PCR_FLAG:
         tasks.append(asyncio.ensure_future(update_pcr_info()))
-    if AZUR_FLAG:
+    if draw_config.AZUR_FLAG:
         tasks.append(asyncio.ensure_future(update_azur_info()))
-    if FGO_FLAG:
+    if draw_config.FGO_FLAG:
         tasks.append(asyncio.ensure_future(update_fgo_info()))
-    if ONMYOJI_FLAG:
+    if draw_config.ONMYOJI_FLAG:
         tasks.append(asyncio.ensure_future(update_onmyoji_info()))
     await asyncio.gather(*tasks)
-    logger.info("draw_card 抽卡自动更新完成...")
 
 
 # 每天四点重载方舟up卡池
 @scheduler.scheduled_job(
-    "cron",
+    'cron',
     hour=4,
     minute=1,
 )
 async def _():
-    if PRTS_FLAG:
+    if draw_config.PRTS_FLAG:
         await reload_prts_pool()
-        logger.info("自动重载方舟卡池UP成功")
 
 
 # 每天四点重载赛马娘up卡池
 @scheduler.scheduled_job(
-    "cron",
+    'cron',
     hour=4,
     minute=1,
 )
 async def _():
-    if PRETTY_FLAG:
+    if draw_config.PRETTY_FLAG:
         await reload_pretty_pool()
-        logger.info("自动重载赛马娘UP成功")
 
 
 # 每天下午六点点重载原神up卡池
 @scheduler.scheduled_job(
-    "cron",
+    'cron',
     hour=18,
     minute=1,
 )
 async def _():
-    if PRTS_FLAG:
+    if draw_config.PRTS_FLAG:
         await reload_genshin_pool()
-        logger.info("自动重载原神卡池UP成功")
+
+
+# 重载坎公骑冠剑卡池
+@scheduler.scheduled_job(
+    'cron',
+    hour=4,
+    minute=1,
+)
+async def _():
+    if draw_config.GUARDIAN_FLAG:
+        await reload_guardian_pool()