This commit is contained in:
2024-09-13 10:11:54 +08:00
parent b25fcd9ac2
commit 4b8d6a9379
5 changed files with 23 additions and 27 deletions
+4 -1
View File
@@ -46,6 +46,7 @@ do_del_sub(del_sub_matcher)
add_cookie_matcher = on_command(
"添加cookie",
aliases={"添加Cookie"},
rule=configurable_to_me,
permission=SUPERUSER,
priority=5,
@@ -55,6 +56,7 @@ do_add_cookie(add_cookie_matcher)
add_cookie_target_matcher = on_command(
"关联cookie",
aliases={"关联Cookie"},
rule=configurable_to_me,
permission=SUPERUSER,
priority=5,
@@ -64,6 +66,7 @@ do_add_cookie_target(add_cookie_target_matcher)
del_cookie_target_matcher = on_command(
"取消关联cookie",
aliases={"取消关联Cookie"},
rule=configurable_to_me,
permission=SUPERUSER,
priority=5,
@@ -73,6 +76,7 @@ do_del_cookie_target(del_cookie_target_matcher)
del_cookie_matcher = on_command(
"删除cookie",
aliases={"删除Cookie"},
rule=configurable_to_me,
permission=SUPERUSER,
priority=5,
@@ -80,7 +84,6 @@ del_cookie_matcher = on_command(
)
do_del_cookie(del_cookie_matcher)
group_manage_matcher = on_command("群管理", rule=to_me(), permission=SUPERUSER, priority=4, block=True)
group_handle_cancel = gen_handle_cancel(group_manage_matcher, "已取消")
@@ -8,7 +8,7 @@ from nonebot.internal.adapter import MessageTemplate
from ..config import config
from ..utils import parse_text
from ..platform import platform_manager, site_manager
from ..platform import platform_manager
from ..utils.site import CookieClientManager
from .utils import gen_handle_cancel, generate_sub_list_text
@@ -64,7 +64,7 @@ def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
@add_cookie_target_matcher.handle()
async def add_cookie_target_process(state: T_State):
await config.add_cookie_target(state["target"]["target"], state["site"].name, state["cookie"].id)
await config.add_cookie_target(state["target"]["target"], state["target"]["platform_name"], state["cookie"].id)
cookie = state["cookie"]
client_mgr = cast(CookieClientManager, state["site"].client_mgr)
await add_cookie_target_matcher.finish(
+3 -4
View File
@@ -13,8 +13,8 @@ from nonebot_plugin_saa import PlatformTarget, extract_target
from ..config import config
from ..types import Category
from ..platform import platform_manager, site_manager
from ..plugin_config import plugin_config
from ..platform import site_manager, platform_manager
from ..utils.site import CookieClientManager, is_cookie_client_manager
@@ -75,6 +75,7 @@ async def generate_sub_list_text(
is_show_cookie=False,
is_hide_no_cookie_platfrom=False,
):
"""根据配置参数,生产订阅列表文本,同时将订阅信息存入state["sub_table"]"""
if user_info:
sub_list = await config.list_subscribe(user_info)
else:
@@ -107,9 +108,7 @@ 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)
if target_cookies:
res += " 关联的 Cookie\n"
for cookie in target_cookies: