From 3043817de4218e99dfea252c807742bbd72e25f7 Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Mon, 28 Oct 2024 13:29:10 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=B8=BAcookie=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A7=81=E8=81=8A?= =?UTF-8?q?=E6=8B=92=E7=BB=9D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot_bison/sub_manager/add_cookie.py | 5 ++++- nonebot_bison/sub_manager/add_cookie_target.py | 5 ++++- nonebot_bison/sub_manager/del_cookie.py | 5 ++++- nonebot_bison/sub_manager/del_cookie_target.py | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/nonebot_bison/sub_manager/add_cookie.py b/nonebot_bison/sub_manager/add_cookie.py index 4f7dd82..5daa0ef 100644 --- a/nonebot_bison/sub_manager/add_cookie.py +++ b/nonebot_bison/sub_manager/add_cookie.py @@ -6,6 +6,7 @@ from nonebot.typing import T_State from nonebot.matcher import Matcher from nonebot.params import Arg, ArgPlainText from nonebot.adapters import Message, MessageTemplate +from nonebot.adapters.onebot.v11 import MessageEvent, PrivateMessageEvent from ..platform import platform_manager from .utils import common_platform, gen_handle_cancel @@ -16,7 +17,9 @@ def do_add_cookie(add_cookie: type[Matcher]): handle_cancel = gen_handle_cancel(add_cookie, "已中止添加cookie") @add_cookie.handle() - async def init_promote(state: T_State): + async def init_promote(state: T_State, event: MessageEvent): + if not issubclass(PrivateMessageEvent, event.__class__): + await add_cookie.finish("请在私聊中使用此命令") state["_prompt"] = ( "请输入想要添加 Cookie 的平台，目前支持，请输入冒号左边的名称：\n" + "".join( diff --git a/nonebot_bison/sub_manager/add_cookie_target.py b/nonebot_bison/sub_manager/add_cookie_target.py index 8c5cc7a..6ed9f60 100644 --- a/nonebot_bison/sub_manager/add_cookie_target.py +++ b/nonebot_bison/sub_manager/add_cookie_target.py @@ -3,6 +3,7 @@ from nonebot.matcher import Matcher from nonebot.params import ArgPlainText from nonebot_plugin_saa import MessageFactory from nonebot.internal.adapter import MessageTemplate +from nonebot.adapters.onebot.v11 import MessageEvent, PrivateMessageEvent from ..config import config from ..utils import parse_text @@ -14,7 +15,9 @@ def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]): handle_cancel = gen_handle_cancel(add_cookie_target_matcher, "已中止关联 cookie") @add_cookie_target_matcher.handle() - async def init_promote(state: T_State): + async def init_promote(state: T_State, event: MessageEvent): + if not issubclass(PrivateMessageEvent, event.__class__): + await add_cookie_target_matcher.finish("请在私聊中使用此命令") res = await generate_sub_list_text( add_cookie_target_matcher, state, is_index=True, is_show_cookie=True, is_hide_no_cookie_platfrom=True ) diff --git a/nonebot_bison/sub_manager/del_cookie.py b/nonebot_bison/sub_manager/del_cookie.py index 901382a..b958da0 100644 --- a/nonebot_bison/sub_manager/del_cookie.py +++ b/nonebot_bison/sub_manager/del_cookie.py @@ -2,6 +2,7 @@ from nonebot.typing import T_State from nonebot.matcher import Matcher from nonebot.params import EventPlainText from nonebot_plugin_saa import MessageFactory +from nonebot.adapters.onebot.v11 import MessageEvent, PrivateMessageEvent from ..config import config from ..utils import parse_text @@ -12,7 +13,9 @@ def do_del_cookie(del_cookie: type[Matcher]): handle_cancel = gen_handle_cancel(del_cookie, "删除中止") @del_cookie.handle() - async def send_list(state: T_State): + async def send_list(state: T_State, event: MessageEvent): + if not issubclass(PrivateMessageEvent, event.__class__): + await del_cookie.finish("请在私聊中使用此命令") cookies = await config.get_cookie(is_anonymous=False) if not cookies: await del_cookie.finish("暂无已添加的 Cookie\n请使用“添加cookie”命令添加") diff --git a/nonebot_bison/sub_manager/del_cookie_target.py b/nonebot_bison/sub_manager/del_cookie_target.py index f5dce4d..7eb7095 100644 --- a/nonebot_bison/sub_manager/del_cookie_target.py +++ b/nonebot_bison/sub_manager/del_cookie_target.py @@ -2,6 +2,7 @@ from nonebot.typing import T_State from nonebot.matcher import Matcher from nonebot.params import EventPlainText from nonebot_plugin_saa import MessageFactory +from nonebot.adapters.onebot.v11 import MessageEvent, PrivateMessageEvent from ..config import config from ..utils import parse_text @@ -12,7 +13,9 @@ def do_del_cookie_target(del_cookie_target: type[Matcher]): handle_cancel = gen_handle_cancel(del_cookie_target, "取消关联中止") @del_cookie_target.handle() - async def send_list(state: T_State): + async def send_list(state: T_State, event: MessageEvent): + if not issubclass(PrivateMessageEvent, event.__class__): + await del_cookie_target.finish("请在私聊中使用此命令") cookie_targets = await config.get_cookie_target() if not cookie_targets: await del_cookie_target.finish("暂无已关联 Cookie\n请使用“添加cookie”命令添加关联")