✨ 取消关联cookie 对话

nonebot_bison/config/db_config.py

@@ -358,10 +358,23 @@ class DBConfig:
             )
             await sess.commit()
 
-    async def get_cookie_target(self) -> Sequence[CookieTarget]:
+    async def delete_cookie_target_by_id(self, cookie_target_id: int):
         async with create_session() as sess:
-            query = select(CookieTarget).outerjoin(Target).options(selectinload(CookieTarget.target))
+            await sess.execute(delete(CookieTarget).where(CookieTarget.id == cookie_target_id))
-            return (await sess.scalars(query)).all()
+            await sess.commit()
+
+    async def get_cookie_target(self) -> list[CookieTarget]:
+        async with create_session() as sess:
+            query = (
+                select(CookieTarget)
+                .outerjoin(Target)
+                .options(selectinload(CookieTarget.target))
+                .outerjoin(Cookie)
+                .options(selectinload(CookieTarget.cookie))
+            )
+            res = list((await sess.scalars(query)).all())
+            res.sort(key=lambda x: (x.target.platform_name, x.cookie_id, x.target_id))
+            return res
 
 
 config = DBConfig()

nonebot_bison/sub_manager/del_cookie_target.py

@@ -1,9 +1,51 @@
-from nonebot.matcher import Matcher
+from typing import cast
 
-from .utils import ensure_user_info, gen_handle_cancel
+from nonebot.typing import T_State
+from nonebot.matcher import Matcher
+from nonebot.params import EventPlainText
+from nonebot_plugin_saa import MessageFactory
+
+from ..config import config
+from ..utils import parse_text
+from .utils import gen_handle_cancel
+from ..platform import platform_manager
+from ..utils.site import CookieClientManager
 
 
 def do_del_cookie_target(del_cookie_target: type[Matcher]):
-    handle_cancel = gen_handle_cancel(del_cookie_target, "删除中止")
+    handle_cancel = gen_handle_cancel(del_cookie_target, "取消关联中止")
 
-    del_cookie_target.handle()(ensure_user_info(del_cookie_target))
+    @del_cookie_target.handle()
+    async def send_list(state: T_State):
+        cookie_targets = await config.get_cookie_target()
+        if not cookie_targets:
+            await del_cookie_target.finish("暂无已关联 Cookie\n请使用“添加cookie”命令添加关联")
+        res = "已关联的 Cookie 为：\n"
+        state["cookie_target_table"] = {}
+        for index, cookie_target in enumerate(cookie_targets, 1):
+            client_mgr = cast(CookieClientManager, platform_manager[cookie_target.target.platform_name].site.client_mgr)
+            friendly_name = await client_mgr.get_cookie_friendly_name(cookie_target.cookie)
+            state["cookie_target_table"][index] = {
+                "platform_name": cookie_target.target.platform_name,
+                "target": cookie_target.target,
+                "friendly_name": friendly_name,
+                "cookie_target": cookie_target,
+            }
+            res += f"{index} {cookie_target.target.platform_name} {cookie_target.target.target_name} {friendly_name}\n"
+            if res[-1] != "\n":
+                res += "\n"
+        res += "请输入要删除的关联的序号\n输入'取消'中止"
+        await MessageFactory(await parse_text(res)).send()
+
+    @del_cookie_target.receive(parameterless=[handle_cancel])
+    async def do_del(
+        state: T_State,
+        index_str: str = EventPlainText(),
+    ):
+        try:
+            index = int(index_str)
+            await config.delete_cookie_target_by_id(state["cookie_target_table"][index]["cookie_target"].id)
+        except Exception:
+            await del_cookie_target.reject("删除错误")
+        else:
+            await del_cookie_target.finish("删除成功")