diff --git a/nonebot_bison/sub_manager/__init__.py b/nonebot_bison/sub_manager/__init__.py index d54c0f8..59c9294 100644 --- a/nonebot_bison/sub_manager/__init__.py +++ b/nonebot_bison/sub_manager/__init__.py @@ -14,7 +14,7 @@ from nonebot.adapters.onebot.v11.event import PrivateMessageEvent from .add_sub import do_add_sub from .del_sub import do_del_sub from .query_sub import do_query_sub -# from .add_cookie import do_add_cookie +from .add_cookie import do_add_cookie # from .del_cookie import do_del_cookie # from .add_cookie_target import do_add_cookie_target # from .del_cookie_target import do_del_cookie_target @@ -51,7 +51,7 @@ add_cookie_matcher = on_command( priority=5, block=True, ) -# do_add_cookie(add_cookie_matcher) +do_add_cookie(add_cookie_matcher) # add_cookie_target_matcher = on_command( # "关联cookie", diff --git a/nonebot_bison/sub_manager/add_cookie.py b/nonebot_bison/sub_manager/add_cookie.py index 4b912fe..03dbe5b 100644 --- a/nonebot_bison/sub_manager/add_cookie.py +++ b/nonebot_bison/sub_manager/add_cookie.py @@ -44,6 +44,7 @@ def do_add_cookie(add_cookie: type[Matcher]): await add_cookie.finish("已中止添加cookie") elif platform in platform_manager: state["platform"] = platform + state["site"] = platform_manager[platform].site else: await add_cookie.reject("平台输入错误") @@ -62,7 +63,7 @@ def do_add_cookie(add_cookie: type[Matcher]): @add_cookie.handle() async def add_cookie_process(state: T_State): - cookie = Cookie(platform_name=state["platform"], content=state["cookie"]) + cookie = Cookie(site_name=state["site"].name, content=state["cookie"]) client_mgr = cast(CookieClientManager, platform_manager[state["platform"]].site.client_mgr) cookie = await client_mgr.init_cookie(cookie) await config.add_cookie(cookie) diff --git a/nonebot_bison/utils/site.py b/nonebot_bison/utils/site.py index 69503b7..669b7e6 100644 --- a/nonebot_bison/utils/site.py +++ b/nonebot_bison/utils/site.py @@ -156,11 +156,6 @@ def create_cookie_client_manager(site_name: str) -> type[CookieClientManager]: (CookieClientManager,), {"_site_name": site_name}, ) -# -# def create_cookie_client_manager(platform_name: str): -# """创建一个平台特化的 CookieClientManger""" -# return DefaultClientManager -# class Site(metaclass=RegistryMeta,base=True):