nonebot-plugin-splatoon3-nso 2.2.2__tar.gz → 2.2.6__tar.gz

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-splatoon3-nso
-Version: 2.2.2
+Version: 2.2.6
 Summary: 一个基于nonebot2框架的splatoon3游戏nso数据查询插件
 Author: cypas
 Author-email: cypas <ayano05@outlook.com>
@@ -18,6 +18,7 @@ Requires-Dist: nonebot-adapter-onebot>=2.4.6,<3
 Requires-Dist: nonebot-adapter-telegram>=0.1.0b20,<0.2
 Requires-Dist: nonebot-adapter-kaiheila>=0.3.4,<0.4
 Requires-Dist: nonebot-adapter-qq>=1.7.1,<2
+Requires-Dist: nonebot-adapter-discord>=1.1.9,<2
 Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<0.6
 Requires-Dist: nonebot-plugin-datastore>=1.3.0,<2
 Requires-Dist: nonebot-plugin-htmlrender>=0.6.7,<0.7
@@ -72,6 +73,9 @@ _✨ splatoon3 nso查询插件 ✨_
 <a href="https://github.com/nonebot/adapter-qq">
 <img src="https://img.shields.io/badge/QQ-Adapter-lightgrey?style=social" alt="QQ">
 </a>
+<a href="https://github.com/nonebot/adapter-discord">
+<img src="https://img.shields.io/badge/discord-Adapter-lightgrey?style=social&logo=discord" alt="discord">
+</a>
 </p>
 
 </div>
@@ -81,7 +85,7 @@ _✨ splatoon3 nso查询插件 ✨_
 - 一个基于nonebot2框架的splatoon3
   nso查询插件,支持onebot11,onebot12,[telegram](https://github.com/nonebot/adapter-telegram)
   协议,[kook](https://github.com/Tian-que/nonebot-adapter-kaiheila)
-  协议,[QQ官方bot](https://github.com/nonebot/adapter-qq)协议
+  协议,[QQ官方bot](https://github.com/nonebot/adapter-qq)协议,[discord](https://github.com/nonebot/adapter-discord)协议
 - 本仓库代码是基于paul的[splatoon3-bot](https://github.com/paul-sama/splatoon3-bot)内的nso插件进行的重构版本
 - 建议配合我做的[日程查询插件](https://github.com/Cypas/splatoon3-schedule)一起使用
 

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/README.md

@@ -37,6 +37,9 @@ _✨ splatoon3 nso查询插件 ✨_
 <a href="https://github.com/nonebot/adapter-qq">
 <img src="https://img.shields.io/badge/QQ-Adapter-lightgrey?style=social" alt="QQ">
 </a>
+<a href="https://github.com/nonebot/adapter-discord">
+<img src="https://img.shields.io/badge/discord-Adapter-lightgrey?style=social&logo=discord" alt="discord">
+</a>
 </p>
 
 </div>
@@ -46,7 +49,7 @@ _✨ splatoon3 nso查询插件 ✨_
 - 一个基于nonebot2框架的splatoon3
   nso查询插件,支持onebot11,onebot12,[telegram](https://github.com/nonebot/adapter-telegram)
   协议,[kook](https://github.com/Tian-que/nonebot-adapter-kaiheila)
-  协议,[QQ官方bot](https://github.com/nonebot/adapter-qq)协议
+  协议,[QQ官方bot](https://github.com/nonebot/adapter-qq)协议,[discord](https://github.com/nonebot/adapter-discord)协议
 - 本仓库代码是基于paul的[splatoon3-bot](https://github.com/paul-sama/splatoon3-bot)内的nso插件进行的重构版本
 - 建议配合我做的[日程查询插件](https://github.com/Cypas/splatoon3-schedule)一起使用
 

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/__init__.py

@@ -21,7 +21,7 @@ __plugin_meta__ = PluginMetadata(
     homepage="https://github.com/Cypas/splatoon3-nso",
     # 发布必填。
     config=Config,
-    supported_adapters={"~onebot.v11", "~onebot.v12", "~telegram", "~kaiheila", "~qq"},
+    supported_adapters={"~onebot.v11", "~onebot.v12", "~telegram", "~kaiheila", "~qq", "~discord"},
 )
 
 

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/data/data_source.py

@@ -258,7 +258,7 @@ def model_get_all_active_report_user() -> list[UserTable]:
             or_(
                 func.date(UserTable.last_cmd_time) == today,
                 func.date(UserTable.last_cmd_time) == yesterday,
-                func.date(UserTable.last_cmd_time) == two_before_day,
+                # func.date(UserTable.last_cmd_time) == two_before_day,
             )
         )
     ))

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/admin.py

@@ -99,7 +99,7 @@ async def admin_cmd(bot: Bot, event: Event, args: Message = CommandArg()):
                                           game_sp_id="", game_name="", nsa_id="", stat_key=admin_stat_key)
                 await bot_send(bot, event, message=f"token已恢复")
 
-        case "help":
+        case "help" | "":
             """指令目录"""
             msg = "所有命令都需要加上/admin 前缀\n" \
                   "get_push 获取当前push统计\n" \
@@ -187,7 +187,7 @@ async def admin_cmd(bot: Bot, event: Event, args: Message = CommandArg()):
                 return False
             # 设置别人的值
             dict_get_or_set_user_info(platform, my_user_id, session_token=user.session_token, access_token="",
-                                      g_token="", bullet_token="", game_sp_id=user.game_sp_id or "",
+                                      g_token="", bullet_token="", game_sp_id=user.game_sp_id or "", stat_key="",
                                       game_name=user.game_name or "", nsa_id=user.nsa_id or "")
             await bot_send(bot, event,
                            message=f"已复制账号 db_id:{user.id},msg_id:{get_msg_id(user.platform, user.user_id)},\ngame_name:{user.game_name}\n还原:/admin restore_token")

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/battle.py

@@ -167,11 +167,11 @@ async def get_battle_msg_md(b_info, battle_detail, get_equip=False, idx=0, splat
     title += ('##### 奖牌:' + ' '.join(award_list) + '\n')
 
     # 打印图例说明
-    user_create_dt = splatoon.user_db_info.create_time + timedelta(days=7)
-    plugin_release_dt = get_time_now_china_date(plugin_release_time) + timedelta(days=7)
+    user_create_dt = splatoon.user_db_info.create_time + timedelta(days=14)
+    plugin_release_dt = get_time_now_china_date(plugin_release_time) + timedelta(days=14)
     now_dt = get_time_now_china()
     if (now_dt < plugin_release_dt or now_dt < user_create_dt) and not push_statistics:
-        footer += f'\n###### 本注解说明会在登录7天后不再显示' \
+        footer += f'\n###### 本注解说明会在登录14天后不再显示' \
                   f'</br>用户名颜色: <b>粗体黑色</b>:玩家自己，' \
                   f'<span style="color:green">绿色 </span> :已在bot登录的用户，' \
                   f'<span style="color:skyblue">浅蓝色 </span> :某个已登录用户的好友(大概率国人)' \

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/coop.py

@@ -145,8 +145,8 @@ async def get_coop_msg_md(coop_info, coop_detail, coop_defeat=None, mask=False,
         msg += f"\n##### 时间: {str_time}"
 
         # 打印图例说明
-        user_create_dt = splatoon.user_db_info.create_time + timedelta(days=7)
-        plugin_release_dt = get_time_now_china_date(plugin_release_time) + timedelta(days=7)
+        user_create_dt = splatoon.user_db_info.create_time + timedelta(days=14)
+        plugin_release_dt = get_time_now_china_date(plugin_release_time) + timedelta(days=14)
         now_dt = get_time_now_china()
         if now_dt < plugin_release_dt or now_dt < user_create_dt:
             msg += f'\n###### 本注解说明会在登录7天后不再显示' \

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/cron/report.py

@@ -235,7 +235,7 @@ async def create_set_report_tasks(is_corn_job=False, is_inactive_user=False):
     try:
         phase1_splatoons = await asyncio.wait_for(
             asyncio.gather(*phase1_tasks, return_exceptions=True),
-            timeout=2 * 3600
+            timeout=4 * 3600
         )
         # 记录失败的任务
         for i, result in enumerate(phase1_splatoons):
@@ -244,7 +244,7 @@ async def create_set_report_tasks(is_corn_job=False, is_inactive_user=False):
                 msg_id = get_msg_id(platform, user_id)
                 cron_logger.error(f"阶段1任务执行失败: {msg_id}, 错误: {result}")
     except asyncio.TimeoutError:
-        cron_logger.error("阶段1任务执行超时(2小时),已自动退出")
+        cron_logger.error("阶段1任务执行超时(4小时),已自动退出")
         phase1_splatoons = []
 
     # 标记阶段1已完成
@@ -538,12 +538,12 @@ async def send_report_task():
         if not have_report:
             continue
         counters["new_report_count"] += 1
-        # 排除qq平台发信 和 日报通知未打开的用户
-        if user.platform == "QQ" or not user.report_notify:
+        # 排除 日报通知未打开的用户
+        if not user.report_notify:
             continue
         counters["can_send_report_count"] += 1
         # 每次循环强制睡眠0.1s，使一分钟内不超过120次发信阈值
-        await asyncio.sleep(0.1)
+        await asyncio.sleep(0.2)
         try:
             msg = get_report(user.platform, user.user_id, _type="cron")
             if msg:

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/history.py

@@ -6,14 +6,14 @@ from ..s3s.splatoon import Splatoon
 from ..utils.bot import *
 
 
-@on_command("history", aliases={'his'}, priority=10, block=True).handle(parameterless=[Depends(_check_session_handler)])
-async def history(bot: Bot, event: Event, args: Message = CommandArg()):
+@on_regex(r"^[\/.,，。]?(?:history|his)[ ]?(.*)$", priority=10, block=True).handle(parameterless=[Depends(_check_session_handler)])
+async def history(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
     """历史记录查询"""
     _type = 'open'
     _type_str = '开放'
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
-    cmd_message = args.extract_plain_text().strip()
+    cmd_message = str(re_tuple[0] or "").strip()
     logger.debug(f'history: {cmd_message}')
     if cmd_message:
         cmd_lst = cmd_message.split()

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/last.py

@@ -15,11 +15,13 @@ from ..s3s.splatoon import Splatoon
 from ..s3s.utils import SPLATNET3_URL
 from ..utils.bot import *
 
-matcher_last = on_command("last", priority=10, block=True)
+matcher_last = on_regex(
+    r"^[\/.,，。]?last(?:[ ]*((?:battle|b|coop|c|equip|e|image|i|screenshot|ss|mask|m|\d+)(?:[ ]*(?:battle|b|coop|c|equip|e|image|i|screenshot|ss|mask|m|\d+))*))?[ ]?$",
+    priority=10, block=True)
 
 
 @matcher_last.handle(parameterless=[Depends(_check_session_handler)])
-async def last(bot: Bot, event: Event, args: Message = CommandArg()):
+async def last(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
     """获取上一局对战或打工数据图"""
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
@@ -33,7 +35,7 @@ async def last(bot: Bot, event: Event, args: Message = CommandArg()):
     get_image = False
     mask = False
     idx = 0
-    cmd_message = args.extract_plain_text().strip()
+    cmd_message = str(re_tuple[0] or "").strip()
     logger.debug(f'last: {cmd_message}')
     # 筛选参数
     if cmd_message:
@@ -130,7 +132,9 @@ async def get_last_battle_or_coop(bot, event, for_push=False, get_battle=False,
 
     # 如果qq平台用户的用户名还是默认值QQ群，请求接口获取真实名字
     if isinstance(splatoon.bot, QQ_Bot) and (
-            splatoon.user_name in ["QQ群", "QQ私信"] or splatoon.user_id == splatoon.user_name):
+            splatoon.user_name in ["QQ群", "QQ私信"] or
+            splatoon.user_id == splatoon.user_name or
+            not splatoon.user_name):
         user_name = await get_qq_user_name(splatoon.bot, splatoon.user_id)
         # 更新缓存
         if user_name:

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/login.py

@@ -24,7 +24,8 @@ MSG_PRIVATE = "该指令需要私信机器人才能使用"
 global_login_status_dict: dict = {}
 global_login_code_dict: dict = {}
 
-matcher_login_in = on_command("login", aliases={'登录', 'nso登录', "登陸", "nso登陸", 'nso_login', 'nsologin'}, priority=10, block=True)
+matcher_login_in = on_regex(r"^[\/.,，。]?(login|登录|nso登录|登陸|nso登陸|nso_login|nsologin)[ ]?$",
+                            priority=10, block=True)
 
 
 @matcher_login_in.handle()
@@ -168,7 +169,7 @@ async def login_in_2(bot: Bot, event: Event):
     new_user_name = event_info.get('user_name', "")
 
     # 如果qq平台用户的用户名还是默认值QQ群，请求接口获取真实名字
-    if isinstance(bot, QQ_Bot):
+    if isinstance(bot, QQ_Bot) and (new_user_name in ["QQ群", "QQ私信"] or user_id == new_user_name or not new_user_name):
         user_name = await get_qq_user_name(bot, user_id)
         if user_name:
             new_user_name = user_name
@@ -233,14 +234,15 @@ async def login_in_2(bot: Bot, event: Event):
     except Exception as e:
         game_sp_id = None
 
-    _msg = f'new_login_user:{msg_id}\n会话昵称:{new_user_name}\nns_player_code:{game_sp_id}\n{session_token}'
+    _msg = f'new_login_user:{msg_id}\n会话昵称:{new_user_name}\nns_player_code:{game_sp_id}'
     # 写登陆到文件
     write_text = f"用户登陆:msg_id:{msg_id},会话昵称:{user.user_name},游戏昵称:{user.game_name},ns_player_code:{user.game_sp_id}"
     write_login_text(msg_id, text=write_text)
     await notify_to_channel(_msg)
 
 
-@on_command("clear_db_info", aliases={'loginout', 'login_out', '退出登录', "退出登陸"}, priority=10, block=True).handle()
+@on_regex(r"^[\/.,，。]?(clear_db_info|loginout|login_out|退出登录|退出登陸)[ ]?$", priority=10,
+            block=True).handle()
 async def clear_db_info(bot: Bot, event: Event):
     """清空账号数据"""
     platform = bot.adapter.get_name()
@@ -276,7 +278,7 @@ async def clear_db_info(bot: Bot, event: Event):
         global_user_info_dict.pop(msg_id)
 
 
-@on_command("get_login_code", aliases={'getlogincode', 'glc', 'getlc'}, priority=10, block=True).handle(
+@on_regex(r"^[\/.,，。]?(get_login_code|getlogincode|glc|getlc)[ ]?$", priority=10, block=True).handle(
     parameterless=[Depends(_check_session_handler)])
 async def get_login_code(bot: Bot, event: Event):
     """获取绑定码"""
@@ -313,11 +315,11 @@ async def get_login_code(bot: Bot, event: Event):
     await bot_send(bot, event, message=f"/set_login {login_code}", skip_ad=True)
 
 
-@on_command("set_login", priority=10, block=True).handle()
-async def set_login_code(bot: Bot, event: Event):
+@on_regex(r"^[\/.,，。]?set_login[ ]?(.+)$", priority=10, block=True).handle()
+async def set_login_code(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
     """绑定账号"""
 
-    login_code = event.get_plaintext().strip()[10:].strip()
+    login_code = str(re_tuple[0] or "").strip()
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
     msg_id = get_msg_id(platform, user_id)
@@ -371,7 +373,7 @@ async def set_login_code(bot: Bot, event: Event):
     new_user_name = event_info.get('user_name', "")
 
     # 如果qq平台用户的用户名还是默认值QQ群，请求接口获取真实名字
-    if isinstance(bot, QQ_Bot):
+    if isinstance(bot, QQ_Bot) and (new_user_name in ["QQ群", "QQ私信"] or user_id == new_user_name or not new_user_name):
         user_name = await get_qq_user_name(bot, user_id)
         if user_name:
             new_user_name = user_name
@@ -400,7 +402,7 @@ async def set_login_code(bot: Bot, event: Event):
     await notify_to_channel(f"绑定账号成功: {msg_id},{new_user_name}, 旧用户为{old_msg_id},{old_user_name}")
 
 
-matcher_set_api_key = on_command("set_stat_key", aliases={"set_api_key"}, priority=10, block=True)
+matcher_set_api_key = on_regex(r"^[\/.,，。]?(set_stat_key|set_api_key)[ ]?$", priority=10, block=True)
 
 
 @matcher_set_api_key.handle(parameterless=[Depends(_check_session_handler)])
@@ -441,9 +443,9 @@ async def get_set_api_key(bot: Bot, event: Event):
     if isinstance(bot, Tg_Bot):
         msg = "set_api_key success, bot will check every 2 hours and post your data to stat.ink.\n" \
               "first sync will be in minutes."
-    elif isinstance(bot, QQ_Bot):
-        msg = "设置成功，bot将开始同步你当前的对战及打工数据到 stat点ink，并后续每2h自动进行一次同步\n" \
-              "因QQ平台主动推送限制，同步成功时Bot无法主动推送消息，如需确认，请在三分钟后前往stat网站自行查看记录，kook平台bot才可以主动推送"
+    # elif isinstance(bot, QQ_Bot):
+    #     msg = "设置成功，bot将开始同步你当前的对战及打工数据到 stat点ink，并后续每2h自动进行一次同步\n" \
+    #           "因QQ平台主动推送限制，同步成功时Bot无法主动推送消息，如需确认，请在三分钟后前往stat网站自行查看记录，kook平台bot才可以主动推送"
     elif isinstance(bot, All_BOT):
         msg = f"设置成功，bot将开始同步你当前的对战及打工数据到 stat.ink，并后续每2h自动进行一次同步"
     await bot_send(bot, event, message=msg, skip_ad=True)
@@ -454,7 +456,7 @@ async def get_set_api_key(bot: Bot, event: Event):
     asyncio.create_task(sync_stat_ink_func(db_user))
 
 
-@on_command("sync_now", aliases={'sync', 'syncnow', 'syncstat'}, priority=10, block=True).handle(
+@on_regex(r"^[\/.,，。]?(sync_now|sync|syncnow|syncstat)[ ]?$", priority=10, block=True).handle(
     parameterless=[Depends(_check_session_handler)])
 async def sync_now(bot: Bot, event: Event):
     platform = bot.adapter.get_name()
@@ -470,8 +472,8 @@ async def sync_now(bot: Bot, event: Event):
 
     # await update_s3si_ts()
     msg = "战绩手动同步任务已开始，请稍等..."
-    if isinstance(bot, QQ_Bot):
-        msg += "\n因QQ平台主动推送限制，同步成功时Bot无法主动推送消息，如需确认，请在三分钟后前往stat点ink网站自行查看记录，kook平台bot才可以主动推送"
+    # if isinstance(bot, QQ_Bot):
+    #     msg += "\n因QQ平台主动推送限制，同步成功时Bot无法主动推送消息，如需确认，请在三分钟后前往stat点ink网站自行查看记录，kook平台bot才可以主动推送"
     db_user = model_get_or_set_user(platform, user_id)
     if db_user:
         await bot_send(bot, event, msg, skip_ad=True)

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/my.py

@@ -31,7 +31,7 @@ NSO_WEB_CACHE_DICT = {}
 # 连坐字典 记录封禁前最后的sp_id 连坐名单保留一天
 BAN_USER_SP_ID_LIST = []
 
-@on_command("me", priority=10, block=True).handle(parameterless=[Depends(_check_session_handler)])
+@on_regex(r"^[\/.,，。]?me[ ]?$", priority=10, block=True).handle(parameterless=[Depends(_check_session_handler)])
 async def me(bot: Bot, event: Event):
     """查询 我的"""
     await bot_send(bot, event, message="请求个人数据中，请稍等...")
@@ -335,7 +335,7 @@ async def get_me_md(user: GlobalUserInfo, summary, total, coops, weapons, from_g
     return msg
 
 
-@on_command("friends", aliases={'friend', 'fr'}, priority=10, block=True).handle(
+@on_regex(r"^[\/.,，。]?(friends?|fr)[ ]?$", priority=10, block=True).handle(
     parameterless=[Depends(_check_session_handler)])
 async def friends(bot: Bot, event: Event):
     platform = bot.adapter.get_name()
@@ -375,7 +375,7 @@ async def get_friends_md(splatoon, lang='zh-CN'):
         img = f'''<img height="40" src="{icon_img}"/>'''
         if f['playerName'] and f['playerName'] != f['nickname']:
             nickname = game_name_replace(f['nickname'])
-            n = f'{f["playerName"]}|{img}|{nickname}'
+            n = f'{nickname}|{img}|{n}'
         else:
             n = f'{n}|{img}|'
         msg += f'''|{n}| {_state}|\n'''
@@ -395,7 +395,7 @@ async def get_friends_md(splatoon, lang='zh-CN'):
     return msg
 
 
-nsfr = on_command("ns_friends", aliases={'ns_friend', 'ns_fr', 'nsfr'}, priority=10, block=True)
+nsfr = on_regex(r"^[\/.,，。]?(ns_friends?|ns_fr|nsfr)[ ]?$", priority=10, block=True)
 
 
 @nsfr.handle(
@@ -520,11 +520,11 @@ async def get_ns_friends_md(splatoon: Splatoon):
     return msg
 
 
-matcher_fc = on_command("friend_code", aliases={'friends_code', 'fc'}, priority=10, block=True)
+matcher_fc = on_regex(r"^[\/.,，。]?(?:friend_code|friends_code|fc)[ ]?(force)?[ ]?$", priority=10, block=True)
 
 
 @matcher_fc.handle(parameterless=[Depends(_check_session_handler)])
-async def friend_code(bot: Bot, event: Event, args: Message = CommandArg()):
+async def friend_code(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
     """获取ns 好友码"""
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
@@ -532,7 +532,7 @@ async def friend_code(bot: Bot, event: Event, args: Message = CommandArg()):
     force = False  # 强制从接口获取
     msg_id = get_msg_id(platform, user_id)
 
-    if "force" in args.extract_plain_text():
+    if re_tuple[0]:
         force = True
     msg = ""
     if user and user.ns_friend_code and not force:
@@ -643,12 +643,12 @@ def get_cn_sp3_stat(_st):
     return _st
 
 
-@on_command("report_notify", block=True).handle(parameterless=[Depends(_check_session_handler)])
-async def report_notify(bot: Bot, event: Event, args: Message = CommandArg()):
-    if isinstance(bot, QQ_Bot):
-        await bot_send(bot, event, "QQ平台暂不支持本功能")
-        return
-    cmd = args.extract_plain_text().strip()
+@on_regex(r"^[\/.,，。]?report_notify[ ]?(open|close)?[ ]?$", block=True).handle(parameterless=[Depends(_check_session_handler)])
+async def report_notify(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
+    # if isinstance(bot, QQ_Bot):
+    #     await bot_send(bot, event, "QQ平台暂不支持本功能")
+    #     return
+    cmd = str(re_tuple[0] or "").strip()
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
     msg = f'```\n'
@@ -663,12 +663,12 @@ async def report_notify(bot: Bot, event: Event, args: Message = CommandArg()):
     await bot_send(bot, event, message=msg)
 
 
-@on_command("stat_notify", aliases={'api_notify'}, block=True).handle(parameterless=[Depends(_check_session_handler)])
-async def stat_notify(bot: Bot, event: Event, args: Message = CommandArg()):
-    if isinstance(bot, QQ_Bot):
-        await bot_send(bot, event, "QQ平台暂不支持本功能")
-        return
-    cmd = args.extract_plain_text().strip()
+@on_regex(r"^[\/.,，。]?(?:stat_notify|api_notify)[ ]?(open|close)?[ ]?$", block=True).handle(parameterless=[Depends(_check_session_handler)])
+async def stat_notify(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
+    # if isinstance(bot, QQ_Bot):
+    #     await bot_send(bot, event, "QQ平台暂不支持本功能")
+    #     return
+    cmd = str(re_tuple[0] or "").strip()
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
     msg = f'```\n'
@@ -683,15 +683,15 @@ async def stat_notify(bot: Bot, event: Event, args: Message = CommandArg()):
     await bot_send(bot, event, message=msg)
 
 
-@on_command("my_icon", aliases={'myicon'}, block=True).handle(parameterless=[Depends(_check_session_handler)])
-async def my_icon(bot: Bot, event: Event, args: Message = CommandArg()):
+@on_regex(r"^[\/.,，。]?(?:my_icon|myicon)[ ]?(force)?[ ]?$", block=True).handle(parameterless=[Depends(_check_session_handler)])
+async def my_icon(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
     user = dict_get_or_set_user_info(platform, user_id)
     force = False  # 强制从接口获取
     msg_id = get_msg_id(platform, user_id)
 
-    if "force" in args.extract_plain_text():
+    if re_tuple[0]:
         force = True
     msg = ""
     msg_error = "本地未缓存nso头像，请在使用一次/last 命令进行缓存后重试"
@@ -751,8 +751,8 @@ async def re_enable(bot: Bot, event: Event):
                     model_get_or_set_user(u.platform, u.user_id, user_agreement=1)
 
 
-@on_command("观星导出", aliases={"觀星導出"}, block=True).handle(parameterless=[Depends(_check_session_handler)])
-async def seed_export(bot: Bot, event: Event, matcher: Matcher, args: Message = CommandArg()):
+@on_regex(r"^[\/.,，。]?(观星导出|觀星導出)[ ]?$", block=True).handle(parameterless=[Depends(_check_session_handler)])
+async def seed_export(bot: Bot, event: Event, matcher: Matcher):
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
     net_error_msg = "bot网络错误，请稍后再试"
@@ -891,9 +891,9 @@ def clean_ban_user_sp_id_list():
     """每日清空ban_sp_id连坐列表"""
     BAN_USER_SP_ID_LIST.clear()
 
-@on_command("nso_web", aliases={'nso网页版', 'nso網頁版', 'nsoweb'}, block=True).handle(
+@on_regex(r"^[\/.,，。]?(nso_web|nso网页版|nso網頁版|nsoweb)[ ]?$", block=True).handle(
     parameterless=[Depends(_check_session_handler)])
-async def nso_web(bot: Bot, event: Event, matcher: Matcher, args: Message = CommandArg()):
+async def nso_web(bot: Bot, event: Event, matcher: Matcher):
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
     net_error_msg = "bot网络错误，请稍后再试"
@@ -961,8 +961,8 @@ async def nso_web(bot: Bot, event: Event, matcher: Matcher, args: Message = Comm
         await bot_send(bot, event, message=msg3, skip_ad=True)
 
 
-@on_command("更多nso指令", aliases={'更多nso指令'}, block=True).handle()
-async def more_nso_help(bot: Bot, event: Event, args: Message = CommandArg()):
+@on_regex(r"^[\/.,，。]?更多nso指令[ ]?$", block=True).handle()
+async def more_nso_help(bot: Bot, event: Event):
     """发送更多nso帮助的二级md菜单"""
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()

{nonebot_plugin_splatoon3_nso-2.2.2 → nonebot_plugin_splatoon3_nso-2.2.6}/nonebot_plugin_splatoon3_nso/handle/other.py

@@ -135,7 +135,7 @@ async def c2c_face_image_command(bot: Bot, event: QQ_C2CME, matcher: Matcher):
         matcher.stop_propagation()
 
 
-@on_command("help", aliases={"h", "帮助", "说明", "文档", "幫助", "說明", "文檔"}, priority=10).handle()
+@on_regex(r"^[\/.,，。]?(help|h|帮助|说明|文档|幫助|說明|文檔)[ ]?$", priority=10).handle()
 async def nso_help(bot: Bot, event: Event):
     # 帮助菜单日程插件优先模式
     if plugin_config.splatoon3_schedule_plugin_priority_mode:
@@ -170,9 +170,10 @@ async def bot_added_event(bot: QQ_Bot, event: Event, matcher: Matcher):
         await bot_send(bot, event, msg)
 
 
-@on_command("免艾特申请", aliases={'免艾特申請'}, priority=10, block=True).handle()
-async def full_message_help(bot: Bot, event: Event, matcher: Matcher, args: Message = CommandArg()):
+@on_regex(r"^[\/.,，。]?(?:免艾特申请|免艾特申請)[ ]?(\d*)[ ]?$", priority=10, block=True).handle()
+async def full_message_help(bot: Bot, event: Event, matcher: Matcher, re_tuple: Tuple = RegexGroup()):
     """全量消息申请菜单"""
+    plain_text = str(re_tuple[0] or "").strip()
     platform = bot.adapter.get_name()
     user_id = event.get_user_id()
     msg_id = get_msg_id(platform, user_id)
@@ -192,7 +193,6 @@ async def full_message_help(bot: Bot, event: Event, matcher: Matcher, args: Mess
 
     bot_qq = f_config.bot_qq
     bot_uid = f_config.bot_uid
-    plain_text = args.extract_plain_text().strip()
     if not plain_text or not plain_text.isdigit():
         await matcher.finish("申请命令后面请加上qq群号，如/免艾特申请 1234567890")
     qq_group_id = plain_text