♻️ 重构 get_cookie 方法

nonebot_bison/sub_manager/add_cookie_target.py

@@ -36,10 +36,12 @@ def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
     @add_cookie_target_matcher.handle()
     async def init_promote_cookie(state: T_State):
 
-        cookies = await config.get_cookie(site_name=state["site"].name)
+        # 获取 site 的所有用户 cookie，再排除掉已经关联的 cookie，剩下的就是可以关联的 cookie
+        cookies = await config.get_cookie(site_name=state["site"].name, is_anonymous=False)
         associated_cookies = await config.get_cookie(
             target=state["target"]["target"],
             site_name=state["site"].name,
+            is_anonymous=False,
         )
         associated_cookie_ids = {cookie.id for cookie in associated_cookies}
         cookies = [cookie for cookie in cookies if cookie.id not in associated_cookie_ids]

nonebot_bison/sub_manager/del_cookie.py

@@ -14,7 +14,7 @@ def do_del_cookie(del_cookie: type[Matcher]):
 
     @del_cookie.handle()
     async def send_list(state: T_State):
-        cookies = await config.get_cookie()
+        cookies = await config.get_cookie(is_anonymous=False)
         if not cookies:
             await del_cookie.finish("暂无已添加 Cookie\n请使用“添加cookie”命令添加")
         res = "已添加的 Cookie 为：\n"

nonebot_bison/sub_manager/utils.py

@@ -108,7 +108,9 @@ async def generate_sub_list_text(
                 if sub.tags:
                     res += " {}".format(", ".join(sub.tags)) + "\n"
             if is_show_cookie:
-                target_cookies = await config.get_cookie(target=sub.target.target, site_name=platform.site.name)
+                target_cookies = await config.get_cookie(
+                    target=sub.target.target, site_name=platform.site.name, is_anonymous=False
+                )
                 if target_cookies:
                     res += "  关联的 Cookie：\n"
                     for cookie in target_cookies: