🐛 查询订阅时提示不存在的平台 (#584)

* 🐛 查询订阅时提示不存在的平台 fix #515 * 💄 auto fix by pre-commit hooks * 🐛 删除订阅时，获取详细信息跳过不存在的platform * ✅ 添加对于不存在的平台的单元测试 * 🐛 删除订阅时跳过不存在的platform * 💄 规范化订阅列表的输出 * 💄 规范化订阅列表的输出 * 💄 规范化订阅列表的输出 * 💄 规范化订阅列表的输出 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-06-02 09:26:12 +08:00 · 2024-07-03 10:26:58 +08:00 · 2024-07-03 10:26:58 +08:00 · 4d4d1060de
commit 4d4d1060de
parent b330644b39
4 changed files with 111 additions and 14 deletions
--- a/nonebot_bison/scheduler/manager.py
+++ b/nonebot_bison/scheduler/manager.py
@ -52,6 +52,8 @@ async def handle_insert_new_target(platform_name: str, target: T_Target):


 async def handle_delete_target(platform_name: str, target: T_Target):
+    if platform_name not in platform_manager:
+        return
    platform = platform_manager[platform_name]
    scheduler_obj = scheduler_dict[platform.site]
    scheduler_obj.delete_schedulable(platform_name, target)
--- a/nonebot_bison/sub_manager/del_sub.py
+++ b/nonebot_bison/sub_manager/del_sub.py
@ -28,12 +28,15 @@ def do_del_sub(del_sub: type[Matcher]):
                "target": sub.target.target,
            }
            res += f"{index} {sub.target.platform_name} {sub.target.target_name} {sub.target.target}\n"
-            platform = platform_manager[sub.target.platform_name]
-            if platform.categories:
-                res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories))
-            if platform.enable_tag:
-                res += " {}".format(", ".join(sub.tags))
-            res += "\n"
+            if platform := platform_manager.get(sub.target.platform_name):
+                if platform.categories:
+                    res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories))
+                if platform.enable_tag:
+                    res += " {}".format(", ".join(sub.tags))
+            else:
+                res += f" （平台 {sub.target.platform_name} 已失效，请删除此订阅）"
+            if res[-1] != "\n":
+                res += "\n"
        res += "请输入要删除的订阅的序号\n输入'取消'中止"
        await MessageFactory(await parse_text(res)).send()

--- a/nonebot_bison/sub_manager/query_sub.py
+++ b/nonebot_bison/sub_manager/query_sub.py
@ -17,12 +17,15 @@ def do_query_sub(query_sub: type[Matcher]):
        sub_list = await config.list_subscribe(user_info)
        res = "订阅的帐号为：\n"
        for sub in sub_list:
-            res += f"{sub.target.platform_name} {sub.target.target_name} {sub.target.target}"
-            platform = platform_manager[sub.target.platform_name]
-            if platform.categories:
-                res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories))
-            if platform.enable_tag:
-                res += " {}".format(", ".join(sub.tags))
-            res += "\n"
+            res += f"{sub.target.platform_name} {sub.target.target_name} {sub.target.target}\n"
+            if platform := platform_manager.get(sub.target.platform_name):
+                if platform.categories:
+                    res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories))
+                if platform.enable_tag:
+                    res += " {}".format(", ".join(sub.tags))
+            else:
+                res += f" （平台 {sub.target.platform_name} 已失效，请删除此订阅）"
+            if res[-1] != "\n":
+                res += "\n"
        await MessageFactory(await parse_text(res)).send()
        await query_sub.finish()
--- a/tests/sub_manager/test_query_del.py
+++ b/tests/sub_manager/test_query_del.py
@ -32,7 +32,45 @@ async def test_query_sub(app: App, init_scheduler):
        ctx.should_pass_permission()
        should_send_saa(
            ctx,
-            MessageFactory("订阅的帐号为：\nweibo 明日方舟Arknights 6279793937 [图文] 明日方舟\n"),
+            MessageFactory("订阅的帐号为：\nweibo 明日方舟Arknights 6279793937\n [图文] 明日方舟\n"),
+            bot,
+            event=event,
+        )
+
+
+@pytest.mark.asyncio
+async def test_query_no_exsits_sub(app: App, init_scheduler):
+    from nonebot.adapters.onebot.v11 import Bot, Message
+    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+
+    from nonebot_bison.types import Target
+    from nonebot_bison.config import config
+    from nonebot_bison.platform import platform_manager
+    from nonebot_bison.sub_manager import query_sub_matcher
+
+    platform_manager["no_exsits_platform"] = platform_manager["weibo"]
+    await config.add_subscribe(
+        TargetQQGroup(group_id=10000),
+        Target("6279793937"),
+        "明日方舟Arknights",
+        "no_exsits_platform",
+        [platform_manager["weibo"].reverse_category["图文"]],
+        ["明日方舟"],
+    )
+    del platform_manager["no_exsits_platform"]
+    async with app.test_matcher(query_sub_matcher) as ctx:
+        bot = ctx.create_bot(base=Bot)
+
+        event = fake_group_message_event(message=Message("查询订阅"), to_me=True)
+        ctx.receive_event(bot, event)
+        ctx.should_pass_rule()
+        ctx.should_pass_permission()
+        should_send_saa(
+            ctx,
+            MessageFactory(
+                "订阅的帐号为：\nno_exsits_platform 明日方舟Arknights 6279793937\n"
+                + " （平台 no_exsits_platform 已失效，请删除此订阅）\n"
+            ),
            bot,
            event=event,
        )
@ -87,6 +125,57 @@ async def test_del_sub(app: App, init_scheduler):
    assert len(subs) == 0


+@pytest.mark.asyncio
+async def test_del_no_exsits_sub(app: App, init_scheduler):
+    from nonebot.adapters.onebot.v11.bot import Bot
+    from nonebot.adapters.onebot.v11.message import Message
+    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
+
+    from nonebot_bison.types import Target
+    from nonebot_bison.config import config
+    from nonebot_bison.platform import platform_manager
+    from nonebot_bison.sub_manager import del_sub_matcher
+
+    platform_manager["no_exsits_platform"] = platform_manager["weibo"]
+    await config.add_subscribe(
+        TargetQQGroup(group_id=10000),
+        Target("6279793937"),
+        "明日方舟Arknights",
+        "no_exsits_platform",
+        [platform_manager["weibo"].reverse_category["图文"]],
+        ["明日方舟"],
+    )
+    del platform_manager["no_exsits_platform"]
+    async with app.test_matcher(del_sub_matcher) as ctx:
+        bot = ctx.create_bot(base=Bot)
+        assert isinstance(bot, Bot)
+        event = fake_group_message_event(message=Message("删除订阅"), to_me=True, sender=fake_admin_user)
+        ctx.receive_event(bot, event)
+        ctx.should_pass_rule()
+        ctx.should_pass_permission()
+        should_send_saa(
+            ctx,
+            MessageFactory(
+                "订阅的帐号为：\n"
+                + "1 no_exsits_platform 明日方舟Arknights 6279793937\n"
+                + " （平台 no_exsits_platform 已失效，请删除此订阅）\n"
+                + "请输入要删除的订阅的序号\n输入'取消'中止",
+            ),
+            bot,
+            event=event,
+        )
+        event_1_err = fake_group_message_event(message=Message("2"), sender=fake_admin_user)
+        ctx.receive_event(bot, event_1_err)
+        ctx.should_call_send(event_1_err, "删除错误", True)
+        ctx.should_rejected()
+        event_1_ok = fake_group_message_event(message=Message("1"), sender=fake_admin_user)
+        ctx.receive_event(bot, event_1_ok)
+        ctx.should_call_send(event_1_ok, "删除成功", True)
+        ctx.should_finished()
+    subs = await config.list_subscribe(TargetQQGroup(group_id=10000))
+    assert len(subs) == 0
+
+
@pytest.mark.asyncio
 async def test_del_empty_sub(app: App, init_scheduler):
    from nonebot.adapters.onebot.v11.bot import Bot