nonebot-plugin-maimaidx 3.1.2__tar.gz → 3.1.5__tar.gz

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-maimaidx
-Version: 3.1.2
+Version: 3.1.5
 Summary: maimaidx plugin for nonebot2
 Author-email: Yuri-YuzuChaN <806235364@qq.com>
 License-Expression: MIT
@@ -14,7 +14,7 @@ License-File: LICENSE
 Requires-Dist: nonebot2<3.0.0,>=2.0.0
 Requires-Dist: nonebot-adapter-onebot<3.0.0,>=2.2.2
 Requires-Dist: nonebot-plugin-apscheduler<1.0.0,>=0.3.0
-Requires-Dist: aiofiles<25.0.0,>=23.2.1
+Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: httpx<1.0.0,>=0.23.1
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: pyecharts<3.0.0,>=2.0.0
@@ -40,6 +40,17 @@ Dynamic: license-file
 
 ## 重要更新
 
+**2026-11-02**
+
+1. 新版本已完全废弃水鱼开发者Token，请前往水鱼 [开发者控制台](https://auth.diving-fish.com/console) 申请新应用，使用OAuth认证，未配置或者未授权仅可使用 `b50` 指令
+2. 修改了水鱼查分器的请求方式，移除废弃API端点
+3. 修复使用水鱼查分器查询b50无法显示 `镜` 牌的问题，牌子可自行修改 `plate_version` 文件夹内的所有 `镜` 牌为繁体字的 `鏡`。以下压缩包包含新的曲目 `魔法仕掛けのファンタジア` 曲绘，新的 `鏡` 牌和 `廻` 牌文件
+   - [cloudreve](https://cloud.yuzuchan.moe/f/x3f3/Resource%203.1.5%20UPDATE.7z)
+   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzu_yuzuchan_moe/IQBfiyOSmOXEQ6BU4NFfZdxmATlmua1cd1zGUlW3txCwTy8?e=uwrb3h)
+   - [openlist](https://share.yuzuchan.moe/d/downloads/Resource%203.1.5%20UPDATE.7z?sign=lpaSBMx8zCkfIYcyWWVVPu5ozDfs45_1-RMLVeAynH4=:0)
+4. 修复 `我要上分` 指令计算问题
+5. 修复合并别名的时，出现不存在的曲目ID
+
 **2026-08-20**
 
 1. 水鱼查分器新增 `OAuth` 认证，请根据 [配置](#配置) 示例填入相关 后续开发者Token将被废弃
@@ -48,26 +59,6 @@ Dynamic: license-file
 4. 移除了申请别名通过和拒绝的推送
 5. 修改部分绘图
 
-**2026-06-09**
-
-### 现仅支持 `Python 3.10+` ！！！
-
-#### 最好在更新 `舞萌DX 2026` 后再使用该版本
-
-1. 更新支持 `舞萌DX2026`，应该是最后一次大改了
-2. 新支持了 `落雪查分器`
-3. 新功能：
-   - 新增 `舞`，`霸者` 牌子绘图
-   - 新增进度绘图
-   - 新增查询曲目过多时的绘图
-   - 新增切换主题功能
-   - 新增切换查分器功能
-   - 新增 `ap50` 指令（仅限落雪查分器）
-   - 新增 `lxbind`，`主题`，`数据源` 指令
-   - 新增 `牌子条件` 指令
-4. 修改了别名推送的发送方式，防止刷屏
-5. 修复了非常多的 BUG
-
 ## 温馨提示
 
 **请务必看完 `README.MD` 所有内容**
@@ -120,8 +111,8 @@ Dynamic: license-file
    DIVINGFISH_CLIENT_SECRET=            # OAuth 应用秘钥
    DIVINGFISH_SCOPE=""                  # OAuth 权限，根据应用权限进行填写，多个权限用空格隔开，默认值为 `"prober.profile.read"`
    DIVINGFISH_AUTH_URL=                 # 水鱼账号地址，一般不需要填写，默认为 `https://auth.diving-fish.com`
-   DIVINGFISH_TOKEN=                    # 开发者 token，已弃用，见下方说明
    DIVINGFISH_PROBER_PROXY=false        # 是否使用中转访问水鱼查分器，适用于境外服务器
+   DIVINGFISH_TOKEN=                    # 开发者 token，已弃用，见下方说明
 
    # lxns                               # 落雪查分器配置，均未填写将无法使用落雪查分器
    LXNS_DEV_TOKEN=                      # 开发者 token
@@ -131,9 +122,6 @@ Dynamic: license-file
    LXNS_BIND_PRIVATE_ONLY=false         # 是否仅允许私聊完成 OAuth 绑定，默认允许群聊和私聊
    ```
 
-> [!NOTE]
-> 使用水鱼 OAuth 绑定时，用户发送 `dfbind`（或「绑定水鱼」），BOT 会返回一条授权链接，用户打开并确认页面上显示的绑定身份后点击「同意授权」即可，**不需要把授权码回贴给 BOT**。绑定关系与授权范围保存在水鱼服务端，BOT 只保管应用凭据，不保存任何用户令牌；用户可随时在 https://auth.diving-fish.com/apps 撤销授权。未绑定的用户仍可使用 `b50` 指令。
-
 > [!WARNING]
 > `DIVINGFISH_TOKEN`（开发者 token）已被水鱼查分器弃用：它能按 QQ 号读取任意用户的成绩，用户从未对 BOT 做过授权，也无法撤销。水鱼已停止签发新的开发者 token，并将在过渡期后关闭该鉴权方式。请改为申请 OAuth 应用并配置 `DIVINGFISH_CLIENT_ID` 与 `DIVINGFISH_CLIENT_SECRET`。两者同时配置时优先使用 OAuth 授权。
 

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/README.md

@@ -12,6 +12,17 @@
 
 ## 重要更新
 
+**2026-11-02**
+
+1. 新版本已完全废弃水鱼开发者Token，请前往水鱼 [开发者控制台](https://auth.diving-fish.com/console) 申请新应用，使用OAuth认证，未配置或者未授权仅可使用 `b50` 指令
+2. 修改了水鱼查分器的请求方式，移除废弃API端点
+3. 修复使用水鱼查分器查询b50无法显示 `镜` 牌的问题，牌子可自行修改 `plate_version` 文件夹内的所有 `镜` 牌为繁体字的 `鏡`。以下压缩包包含新的曲目 `魔法仕掛けのファンタジア` 曲绘，新的 `鏡` 牌和 `廻` 牌文件
+   - [cloudreve](https://cloud.yuzuchan.moe/f/x3f3/Resource%203.1.5%20UPDATE.7z)
+   - [onedrive](https://yuzuai-my.sharepoint.com/:u:/g/personal/yuzu_yuzuchan_moe/IQBfiyOSmOXEQ6BU4NFfZdxmATlmua1cd1zGUlW3txCwTy8?e=uwrb3h)
+   - [openlist](https://share.yuzuchan.moe/d/downloads/Resource%203.1.5%20UPDATE.7z?sign=lpaSBMx8zCkfIYcyWWVVPu5ozDfs45_1-RMLVeAynH4=:0)
+4. 修复 `我要上分` 指令计算问题
+5. 修复合并别名的时，出现不存在的曲目ID
+
 **2026-08-20**
 
 1. 水鱼查分器新增 `OAuth` 认证，请根据 [配置](#配置) 示例填入相关 后续开发者Token将被废弃
@@ -20,26 +31,6 @@
 4. 移除了申请别名通过和拒绝的推送
 5. 修改部分绘图
 
-**2026-06-09**
-
-### 现仅支持 `Python 3.10+` ！！！
-
-#### 最好在更新 `舞萌DX 2026` 后再使用该版本
-
-1. 更新支持 `舞萌DX2026`，应该是最后一次大改了
-2. 新支持了 `落雪查分器`
-3. 新功能：
-   - 新增 `舞`，`霸者` 牌子绘图
-   - 新增进度绘图
-   - 新增查询曲目过多时的绘图
-   - 新增切换主题功能
-   - 新增切换查分器功能
-   - 新增 `ap50` 指令（仅限落雪查分器）
-   - 新增 `lxbind`，`主题`，`数据源` 指令
-   - 新增 `牌子条件` 指令
-4. 修改了别名推送的发送方式，防止刷屏
-5. 修复了非常多的 BUG
-
 ## 温馨提示
 
 **请务必看完 `README.MD` 所有内容**
@@ -92,8 +83,8 @@
    DIVINGFISH_CLIENT_SECRET=            # OAuth 应用秘钥
    DIVINGFISH_SCOPE=""                  # OAuth 权限，根据应用权限进行填写，多个权限用空格隔开，默认值为 `"prober.profile.read"`
    DIVINGFISH_AUTH_URL=                 # 水鱼账号地址，一般不需要填写，默认为 `https://auth.diving-fish.com`
-   DIVINGFISH_TOKEN=                    # 开发者 token，已弃用，见下方说明
    DIVINGFISH_PROBER_PROXY=false        # 是否使用中转访问水鱼查分器，适用于境外服务器
+   DIVINGFISH_TOKEN=                    # 开发者 token，已弃用，见下方说明
 
    # lxns                               # 落雪查分器配置，均未填写将无法使用落雪查分器
    LXNS_DEV_TOKEN=                      # 开发者 token
@@ -103,9 +94,6 @@
    LXNS_BIND_PRIVATE_ONLY=false         # 是否仅允许私聊完成 OAuth 绑定，默认允许群聊和私聊
    ```
 
-> [!NOTE]
-> 使用水鱼 OAuth 绑定时，用户发送 `dfbind`（或「绑定水鱼」），BOT 会返回一条授权链接，用户打开并确认页面上显示的绑定身份后点击「同意授权」即可，**不需要把授权码回贴给 BOT**。绑定关系与授权范围保存在水鱼服务端，BOT 只保管应用凭据，不保存任何用户令牌；用户可随时在 https://auth.diving-fish.com/apps 撤销授权。未绑定的用户仍可使用 `b50` 指令。
-
 > [!WARNING]
 > `DIVINGFISH_TOKEN`（开发者 token）已被水鱼查分器弃用：它能按 QQ 号读取任意用户的成绩，用户从未对 BOT 做过授权，也无法撤销。水鱼已停止签发新的开发者 token，并将在过渡期后关闭该鉴权方式。请改为申请 OAuth 应用并配置 `DIVINGFISH_CLIENT_ID` 与 `DIVINGFISH_CLIENT_SECRET`。两者同时配置时优先使用 OAuth 授权。
 

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/__init__.py

@@ -64,19 +64,11 @@ async def get_music():
         log.opt(colors=True).info(
             "水鱼查分器已启用「<g>OAuth 授权</g>」，用户需使用「绑定水鱼」指令授权"
         )
-        if dfconfig.divingfish_token:
-            log.opt(colors=True).warning(
-                "<y>已配置水鱼开发者Token，OAuth 授权优先，该配置项可以移除</y>"
-            )
-    elif dfconfig.divingfish_token:
-        log.opt(colors=True).warning(
-            "<y>水鱼开发者Token 已弃用，将在过渡期后停止工作，"
-            "请配置 DIVINGFISH_CLIENT_ID 与 DIVINGFISH_CLIENT_SECRET 改用 OAuth 授权</y>"
-        )
     else:
         log.opt(colors=True).warning(
-            "<r>未配置水鱼查分器 OAuth 应用，查分模块只能使用「b50」指令</r>"
+            "水鱼查分器未配置「<g>OAuth 授权</g>」，用户仅可使用「b50」指令"
         )
+
     if lxnsconfig.lxns_dev_token is None:
         log.opt(colors=True).warning(
             "<r>未配置落雪查分器开发者Token，无法使用落雪数据源</r>"

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/commands/__init__.py

@@ -5,4 +5,3 @@ from . import mai_guess as mai_guess
 from . import mai_score as mai_score
 from . import mai_search as mai_search
 from . import mai_table as mai_table
-from . import oauth_message as oauth_message

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/commands/depend.py

@@ -134,11 +134,17 @@ async def process_regex(
                 case [ds] if is_float(ds):
                     ds1 = ds2 = float(ds)
                 case [ds1_raw, ds2_raw] if is_float(ds1_raw) and is_float(ds2_raw):
-                    ds1, ds2 = float(ds1_raw), float(ds2_raw)
+                    # 帮助里的「定数」「页数」写法：第一个比第二个大时按页数处理
+                    if float(ds1_raw) > float(ds2_raw):
+                        ds1 = ds2 = float(ds1_raw)
+                        page = max(1, int(float(ds2_raw)))
+                    else:
+                        ds1, ds2 = float(ds1_raw), float(ds2_raw)
                 case [ds1_raw, ds2_raw, p_raw] if (
                     is_float(ds1_raw) and is_float(ds2_raw) and p_raw.isdigit()
                 ):
-                    ds1, ds2, page = float(ds1_raw), float(ds2_raw), int(p_raw)
+                    ds1, ds2 = float(ds1_raw), float(ds2_raw)
+                    page = max(1, int(p_raw))
                 case _:
                     await matcher.finish(
                         (

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/commands/mai_base.py

@@ -27,7 +27,6 @@ from ..core.clients.divingfish.exceptions import (
 from ..core.clients.divingfish.oauth import REVOKE_URL, binding_label
 from ..core.clients.exceptions import HTTPError, UnknownError
 from ..core.database.qq import User, update_user
-from ..core.divingfish_oauth import extract_confirmation_code
 from ..core.handler import (
     bind_divingfish,
     bind_lxns,
@@ -38,22 +37,8 @@ from ..core.handler import (
     get_mai_what,
 )
 from ..core.image.tools import image_to_base64, song_chart
-from ..core.lxns_oauth import (
-    extract_authorization_code,
-    is_binding_channel_allowed,
-)
 from ..core.merge.models import ServiceName, Theme
-from ..core.pending_binding import PendingBindingStore
-from ..core.service import mai
-from ..core.tool import qqhash
-from ..resources import Root
-from .depend import (
-    GetOrCreateSender,
-    GetOrCreateUser,
-    GetUserAndAuth,
-    GetUserAndAuthOrNone,
-)
-from .oauth_message import (
+from ..core.oauth import (
     BINDING_TEMPORARY_FAILED_MSG,
     DIVINGFISH_AUTHORIZE_MSG,
     DIVINGFISH_BIND_FAILED_MSG,
@@ -70,6 +55,19 @@ from .oauth_message import (
     LXNS_AUTHORIZE_MSG,
     LXNS_ERROR,
     OAUTH_FAILED_MSG,
+    PendingBindingStore,
+    extract_authorization_code,
+    extract_confirmation_code,
+    is_binding_channel_allowed,
+)
+from ..core.service import mai
+from ..core.tool import qqhash
+from ..resources import Root
+from .depend import (
+    GetOrCreateSender,
+    GetOrCreateUser,
+    GetUserAndAuth,
+    GetUserAndAuthOrNone,
 )
 
 pending_bindings = PendingBindingStore()
@@ -115,6 +113,22 @@ async def complete_lxns_binding(user: User, code: str) -> tuple[str, bool]:
     return result, result == "授权完成。"
 
 
+async def complete_divingfish(qqid: int, code: str) -> tuple[str, bool]:
+    try:
+        await complete_divingfish_binding(qqid, code)
+    except DivingFishBindingMismatchError:
+        # 码有效，但兑出来的授权不是这个 QQ 的。多半是把别人转发来的码
+        # 当成自己的用了——照实说清楚，别让他以为是自己操作错了
+        log.warning("水鱼确认码与发起绑定的用户不一致")
+        return DIVINGFISH_MISMATCH_MSG, False
+    except DivingFishConfirmationCodeError:
+        return DIVINGFISH_CODE_FAILED_MSG, False
+    except (HTTPError, HTTPXError, UnknownError, ValidationError) as error:
+        log.warning(f"水鱼绑定暂时失败：{type(error).__name__}")
+        return DIVINGFISH_CODE_TEMPORARY_FAILED_MSG, False
+    return DIVINGFISH_BIND_SUCCESS_MSG, True
+
+
 update_data = on_command("更新maimai数据", permission=SUPERUSER)
 help = on_command("帮助maimaiDX", aliases={"帮助maimaidx"})
 maimaidxrepo = on_command("项目地址maimaiDX", aliases={"项目地址maimaidx"})
@@ -234,22 +248,6 @@ async def _(
     await bind_code.finish(result, reply_message=True)
 
 
-async def complete_divingfish(qqid: int, code: str) -> tuple[str, bool]:
-    try:
-        await complete_divingfish_binding(qqid, code)
-    except DivingFishBindingMismatchError:
-        # 码有效，但兑出来的授权不是这个 QQ 的。多半是把别人转发来的码
-        # 当成自己的用了——照实说清楚，别让他以为是自己操作错了
-        log.warning("水鱼确认码与发起绑定的用户不一致")
-        return DIVINGFISH_MISMATCH_MSG, False
-    except DivingFishConfirmationCodeError:
-        return DIVINGFISH_CODE_FAILED_MSG, False
-    except (HTTPError, HTTPXError, UnknownError, ValidationError) as error:
-        log.warning(f"水鱼绑定暂时失败：{type(error).__name__}")
-        return DIVINGFISH_CODE_TEMPORARY_FAILED_MSG, False
-    return DIVINGFISH_BIND_SUCCESS_MSG, True
-
-
 @df_bind.handle()
 async def _(
     event: GroupMessageEvent | PrivateMessageEvent,

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/commands/mai_score.py

@@ -10,7 +10,7 @@ from ..config import log
 from ..core.database.qq import User
 from ..core.handler import draw_best50, draw_play_data, draw_song_global_data
 from ..core.image.tools import text_to_bytes_io
-from ..core.merge.models import ServiceName
+from ..core.merge.models import Song
 from ..core.service import mai
 from .depend import GetUserAndAuth
 
@@ -29,39 +29,58 @@ async def _(
     user: User = Depends(GetUserAndAuth),
 ):
     username = message.extract_plain_text().strip()
-    if (is_ap := isinstance(matcher, ap50)) and user.service == ServiceName.DIVINGFISH:
-        await matcher.finish("仅落雪查分器支持AP50指令", reply_message=True)
-    result = await draw_best50(user, username=username, all_perfect=is_ap)
+    result = await draw_best50(
+        user, username=username, all_perfect=isinstance(matcher, ap50)
+    )
     await matcher.send(result, reply_message=True)
 
 
+async def search_song(matcher: Matcher, data: str) -> Song | None:
+    if data.isdigit() and (by_id := mai.total_list.by_id(int(data))):
+        song = by_id
+    elif by_t := mai.total_list.by_name(data):
+        song = by_t
+    elif alias := mai.total_alias_list.by_alias(data):
+        if not alias:
+            await matcher.finish("未找到曲目", reply_message=True)
+        elif len(alias) != 1:
+            msg = "找到相同别名的曲目，请使用以下ID查询：\n"
+            for songs in alias:
+                msg += f"{songs.song_id}：{songs.alias[0]}\n"
+            await matcher.finish(msg.strip(), reply_message=True)
+        else:
+            song = mai.total_list.by_id(alias[0].song_id)
+    else:
+        by_t = mai.total_list.filter(title=data)
+        if (tn := len(by_t)) == 1:
+            song = by_t[0]
+        elif tn <= 5 and tn > 1:
+            msg = f"未找到别名为「{data}」的歌曲，但找到「{tn}」个相似标题的曲目：\n"
+            for s in sorted(by_t, key=lambda x: int(x.song_id)):
+                msg += f"{f'「{s.song_id}」':<7} {s.song_name}\n"
+            msg += "※ 请使用「info xxxxx」查询指定曲目"
+            await matcher.finish(msg, reply_message=True)
+        elif tn > 5:
+            await matcher.finish("查询相似的曲目过多，请缩小范围。", reply_message=True)
+        else:
+            song = None
+
+    return song
+
+
 @info.handle()
 async def _(
     message: Message = CommandArg(),
     user: User = Depends(GetUserAndAuth),
 ):
-    data = message.extract_plain_text().strip()
-    if not data:
+    args = message.extract_plain_text().strip().lower()
+    if not args:
         await info.finish("请输入曲目id或曲名", reply_message=True)
 
-    if data.isdigit() and (by_id := mai.total_list.by_id(int(data))):
-        song = by_id
-    elif by_t := mai.total_list.by_name(data):
-        song = by_t
-    else:
-        aliases = mai.total_alias_list.by_alias(data)
-        if not aliases:
-            await info.finish("未找到曲目", reply_message=True)
-        elif len(aliases) != 1:
-            msg = "找到相同别名的曲目，请使用以下ID查询：\n"
-            for alias in aliases:
-                msg += f"{alias.song_id}：{alias.alias[0]}\n"
-            await info.finish(msg.strip(), reply_message=True)
-        else:
-            song_id = aliases[0].song_id
-        song = mai.total_list.by_id(song_id)
-        if song is None:
-            await info.finish("未找到曲目", reply_message=True)
+    song = await search_song(info, args)
+
+    if song is None:
+        await info.finish("未找到曲目", reply_message=True)
 
     result = await draw_play_data(user, song)
     await info.send(result, reply_message=True)
@@ -69,7 +88,7 @@ async def _(
 
 @ginfo.handle()
 async def _(message: Message = CommandArg()):
-    args = message.extract_plain_text().strip()
+    args = message.extract_plain_text().strip().lower()
     if not args:
         await ginfo.finish("请输入曲目id或曲名", reply_message=True)
 
@@ -80,21 +99,11 @@ async def _(message: Message = CommandArg()):
         args = args[1:].strip()
         if not args:
             await ginfo.finish("请输入曲目id或曲名", reply_message=True)
-    if args.isdigit() and (by_id := mai.total_list.by_id(int(args))):
-        song = by_id
-    elif by_t := mai.total_list.by_name(args):
-        song = by_t
-    else:
-        alias = mai.total_alias_list.by_alias(args)
-        if not alias:
-            await ginfo.finish("未找到曲目", reply_message=True)
-        elif len(alias) != 1:
-            msg = "找到相同别名的曲目，请使用以下ID查询：\n"
-            for songs in alias:
-                msg += f"{songs.song_id}：{songs.alias[0]}\n"
-            await ginfo.finish(msg.strip(), reply_message=True)
-        else:
-            song = mai.total_list.by_id(alias[0].song_id)
+
+    song = await search_song(ginfo, args)
+    if song is None:
+        await ginfo.finish("未找到曲目", reply_message=True)
+
     if level_index >= len(song.difficulties):
         await ginfo.finish("该乐曲没有这个等级", reply_message=True)
     stats = song.difficulties[level_index].stats

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/commands/mai_table.py

@@ -8,7 +8,14 @@ from nonebot.params import Depends, RegexMatched
 from nonebot.permission import SUPERUSER
 from PIL import Image
 
-from ..constants import COMBO_PLUS, LEVEL_LIST, PLATE_CN, RANK_PLUS, SYNC_PLUS
+from ..constants import (
+    CB_SYNC_MAP,
+    COMBO_PLUS,
+    LEVEL_LIST,
+    PLATE_CN,
+    RANK_PLUS,
+    SYNC_PLUS,
+)
 from ..core.database.qq import User
 from ..core.handler import (
     draw_level_progress,
@@ -26,7 +33,7 @@ from .depend import GetUserAndAuth
 
 RATING_PATTERN = r"^([0-9]+\+?)((s+|ap|fc|fs|fdx)\+?)?\s?完成表$"
 TABLE_PATTERN = (
-    r"^([真超檄橙暁晓桃櫻樱紫菫堇白雪輝辉舞霸熊華华爽煌星宙祭祝双宴镜彩])"
+    r"^([真超檄橙暁晓桃櫻樱紫菫堇白雪輝辉舞霸熊華华爽煌星宙祭祝双宴镜鏡彩])"
     r"([極极将舞神者]舞?){}表?\s?([0-9]+)?$"
 )
 LEVEL_PATTERN = r"^([0-9]+\+?)\s?((?:a+|b+|c|d|s+|ap|fc|fs|fdx)\+?)\s?([\u4e00-\u9fa5]+)?\s?进度\s?([0-9]+)?$"
@@ -70,11 +77,11 @@ async def _():
 
 @rating_table.handle()
 async def _(match: Match[str] = RegexMatched()):
-    rating = match.group(1).strip()
-    if rating in LEVEL_LIST[:6]:
+    level = match.group(1).strip()
+    if level in LEVEL_LIST[:6]:
         result = "只支持查询lv7-15的定数表。"
-    elif rating in LEVEL_LIST[6:]:
-        result = draw_rating_table_text(rating)
+    elif level in LEVEL_LIST[6:]:
+        result = draw_rating_table_text(level)
     else:
         result = "无法识别的定数。"
     await rating_table.send(result, reply_message=True)
@@ -82,19 +89,12 @@ async def _(match: Match[str] = RegexMatched()):
 
 @rating_table_pfm.handle()
 async def _(match: Match[str] = RegexMatched(), user: User = Depends(GetUserAndAuth)):
-    ra = match.group(1)
-    plan = match.group(2)
-    if ra in LEVEL_LIST[:6]:
+    level = match.group(1)
+    plan = (match.group(2) or "").lower()
+    if level in LEVEL_LIST[:6]:
         await rating_table_pfm.finish("只支持查询lv7-15的完成表。", reply_message=True)
-    elif ra in LEVEL_LIST[6:]:
-        if plan and plan.lower() not in COMBO_PLUS:
-            await rating_table_pfm.finish(
-                "完成表目前仅支持「fc」「ap」计划，例如「13fc完成表」「13ap完成表」。",
-                reply_message=True,
-            )
-        pic = await draw_rating_table(
-            user, ra, bool(plan and plan.lower() in COMBO_PLUS)
-        )
+    elif level in LEVEL_LIST[6:]:
+        pic = await draw_rating_table(user, level, CB_SYNC_MAP.get(plan))
         await rating_table_pfm.finish(pic, reply_message=True)
     else:
         await rating_table_pfm.finish("无法识别的定数。", reply_message=True)

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/config.py

@@ -24,7 +24,6 @@ class BaseConfig(BaseModel):
 
 class DivingFishConfig(BaseModel):
     divingfish_prober_proxy: bool = False
-    divingfish_token: str | None = None
     divingfish_client_id: str | None = None
     divingfish_client_secret: str | None = None
     divingfish_auth_url: str = "https://auth.diving-fish.com"

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/constants.py

@@ -83,6 +83,17 @@ SYNC_MAP = {
     "sync": "Sync",
 }
 
+CB_SYNC_MAP: dict[str, tuple[str, ...]] = {
+    "fc": ("fc", "fcp", "ap", "app"),
+    "fc+": ("fcp", "ap", "app"),
+    "ap": ("ap", "app"),
+    "ap+": ("app",),
+    "fs": ("fs", "fsp", "fsd", "fsdp"),
+    "fs+": ("fsp", "fsd", "fsdp"),
+    "fdx": ("fsd", "fsdp"),
+    "fdx+": ("fsdp",),
+}
+
 DIFFS = ["Basic", "Advanced", "Expert", "Master", "Re:Master"]
 LEVEL_LIST = [
     "1",
@@ -174,6 +185,7 @@ DX_VERSION = {
     "双": "maimai でらっくす BUDDiES",
     "宴": "maimai でらっくす BUDDiES PLUS",
     "镜": "maimai でらっくす PRiSM",
+    "鏡": "maimai でらっくす PRiSM",
     "彩": "maimai でらっくす PRiSM PLUS",
     # "丸": "maimai でらっくす CiRCLE"
     # "": "maimai でらっくす CiRCLE PLUS"
@@ -215,11 +227,12 @@ VERSION_MAP = {
     "双": ([DX_VERSION["双"]], "双&宴"),
     "宴": ([DX_VERSION["双"]], "双&宴"),
     "镜": ([DX_VERSION["镜"]], "镜"),
+    "鏡": ([DX_VERSION["鏡"]], "鏡"),
     "彩": ([DX_VERSION["彩"]], "彩"),
     # "丸": ([DX_VERSION["丸"]], "丸"),
     # "": ([DX_VERSION["丸"]], "丸")
 }
-PLATE_CN = {"晓": "暁", "樱": "櫻", "堇": "菫", "辉": "輝", "华": "華"}
+PLATE_CN = {"晓": "暁", "樱": "櫻", "堇": "菫", "辉": "輝", "华": "華", "镜": "鏡"}
 CATEGORY = {
     "流行&动漫": "anime",
     "舞萌": "maimai",

{nonebot_plugin_maimaidx-3.1.2 → nonebot_plugin_maimaidx-3.1.5}/nonebot_plugin_maimaidx/core/clients/divingfish/client.py

@@ -12,7 +12,7 @@ from .exceptions import (
     DivingFishUserDisabledQueryError,
     DivingFishUserNotFoundError,
 )
-from .models import PlayInfoDefault, PlayInfoDev, UserInfo, UserInfoDev, UserRanking
+from .models import RecordsQueryRequest, UserAllRecords, UserInfo, UserRanking
 from .oauth import get_access_token
 
 
@@ -21,14 +21,8 @@ class DivingFishAPI(ApiClient):
     base_url = "https://maimai.diving-fish.com/api/maimaidxprober"
 
     def __init__(self, qqid: int | None = None, username: str | None = None):
-        #: 授权模式下查谁由令牌决定，请求里不再携带 `qq`，也不需要开发者 token
         self.oauth = dfconfig.oauth_enabled and qqid is not None and not username
-        super().__init__(
-            base_url=self.base_url,
-            headers=None
-            if self.oauth or not dfconfig.divingfish_token
-            else {"developer-token": dfconfig.divingfish_token},
-        )
+        super().__init__(base_url=self.base_url)
         self.qqid = qqid
         self._retried = False
         self.json = {}
@@ -36,7 +30,6 @@ class DivingFishAPI(ApiClient):
             self.json["qq"] = qqid
         if username:
             self.json["username"] = username
-            self.json.pop("qq", None)
 
     def _handle_error(self, resp: Response):
         if resp.status_code == 200:
@@ -113,67 +106,18 @@ class DivingFishAPI(ApiClient):
         result = await self._request_data("POST", "/query/player", json=self.json)
         return UserInfo.model_validate(result)
 
-    async def query_user_plate(self, version: list[str]) -> list[PlayInfoDefault]:
-        """
-        请求用户数据
-
-        Params:
-            `version`: 版本
-        Returns:
-            `List[PlayInfoDefault]` 数据列表
-        """
-        if self.oauth:
-            result = await self._request_oauth(
-                "POST", "/player/plate", json={"version": version}
-            )
-        else:
-            self.json["version"] = version
-            result = await self._request_data("POST", "/query/plate", json=self.json)
-
-        return [PlayInfoDefault.model_validate(d) for d in result["verlist"]]
-
-    async def query_user_records(self) -> UserInfoDev:
+    async def query_user_records(
+        self, query: RecordsQueryRequest | None = None
+    ) -> UserAllRecords:
         """
         获取用户所有成绩
 
         Returns:
-            `UserInfoDev` 用户信息
+            `UserAllRecords` 用户信息
         """
-        if self.oauth:
-            result = await self._request_oauth("GET", "/player/records")
-        else:
-            result = await self._request_data(
-                "GET", "/dev/player/records", params=self.json
-            )
-        return UserInfoDev.model_validate(result)
-
-    async def query_user_record(
-        self, *, song_id: str | int | list[str | int]
-    ) -> list[PlayInfoDev]:
-        """
-        获取用户指定曲目成绩
-
-        Params:
-            `song_id`: 曲目id，可以为单个ID或者列表
-        Returns:
-            `List[PlayInfoDev]` 成绩列表
-        """
-        if not isinstance(song_id, list):
-            song_id = [song_id]
-
-        if self.oauth:
-            result = await self._request_oauth(
-                "POST", "/player/record", json={"music_id": song_id}
-            )
-        else:
-            self.json["music_id"] = song_id
-            result = await self._request_data(
-                "POST", "/dev/player/record", json=self.json
-            )
-        if result == {}:
-            return []
-
-        return [PlayInfoDev.model_validate(d) for k, v in result.items() for d in v]
+        params = query.model_dump(exclude_none=True) if query is not None else None
+        result = await self._request_oauth("GET", "/player/records", params=params)
+        return UserAllRecords.model_validate(result)
 
     async def rating_ranking(self) -> list[UserRanking]:
         """