Skip to content

Commit 83aa7c4

Browse files
committed
🐛 forbid adding platform that needs browser in no-browser env
1 parent 29f23eb commit 83aa7c4

File tree

3 files changed

+51
-0
lines changed

3 files changed

+51
-0
lines changed

nonebot_bison/sub_manager/add_sub.py

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from ..types import Target
1010
from ..config import config
1111
from ..apis import check_sub_target
12+
from ..plugin_config import plugin_config
1213
from ..platform import Platform, platform_manager
1314
from ..config.db_config import SubscribeDupException
1415
from .utils import common_platform, ensure_user_info, gen_handle_cancel
@@ -39,6 +40,8 @@ async def parse_platform(state: T_State, platform: str = ArgPlainText()) -> None
3940
elif platform == "取消":
4041
await add_sub.finish("已中止订阅")
4142
elif platform in platform_manager:
43+
if platform_manager[platform].site.require_browser and not plugin_config.bison_use_browser:
44+
await add_sub.finish(f"{platform} 需要启用 bison_use_browser 选项,否则将无法正确订阅")
4245
state["platform"] = platform
4346
else:
4447
await add_sub.reject("平台输入错误")

tests/sub_manager/test_add.py

+44
Original file line numberDiff line numberDiff line change
@@ -615,3 +615,47 @@ async def test_add_with_bilibili_bangumi_target_parser(app: App, init_scheduler)
615615
assert sub.tags == []
616616
assert sub.target.platform_name == "bilibili-bangumi"
617617
assert sub.target.target_name == "汉化日记 第三季"
618+
619+
620+
@pytest.mark.asyncio
621+
async def test_subscribe_platform_requires_browser(app: App, mocker: MockerFixture):
622+
from nonebot.adapters.onebot.v11.event import Sender
623+
from nonebot.adapters.onebot.v11.message import Message
624+
625+
from nonebot_bison.platform import platform_manager
626+
from nonebot_bison.plugin_config import plugin_config
627+
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
628+
629+
mocker.patch.object(plugin_config, "bison_use_browser", False)
630+
631+
async with app.test_matcher(add_sub_matcher) as ctx:
632+
bot = ctx.create_bot()
633+
event_1 = fake_group_message_event(
634+
message=Message("添加订阅"),
635+
sender=Sender(card="", nickname="test", role="admin"),
636+
to_me=True,
637+
)
638+
ctx.receive_event(bot, event_1)
639+
ctx.should_pass_rule()
640+
ctx.should_call_send(
641+
event_1,
642+
BotReply.add_reply_on_platform(platform_manager=platform_manager, common_platform=common_platform),
643+
True,
644+
)
645+
event_2 = fake_group_message_event(
646+
message=Message("全部"), sender=Sender(card="", nickname="test", role="admin")
647+
)
648+
ctx.receive_event(bot, event_2)
649+
ctx.should_rejected()
650+
ctx.should_call_send(
651+
event_2,
652+
BotReply.add_reply_on_platform_input_allplatform(platform_manager),
653+
True,
654+
)
655+
event_3 = fake_group_message_event(message=Message("bilibili"), sender=fake_admin_user)
656+
ctx.receive_event(bot, event_3)
657+
ctx.should_call_send(
658+
event_3,
659+
BotReply.add_reply_need_use_browser("bilibili"),
660+
True,
661+
)

tests/utils.py

+4
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ def add_reply_on_id(platform: object) -> str:
146146
extra_text = ("1." + target_promot + "\n2.") if target_promot else ""
147147
return extra_text + base_text
148148

149+
@staticmethod
150+
def add_reply_need_use_browser(platform: str) -> str:
151+
return f"{platform} 需要启用 bison_use_browser 选项,否则将无法正确订阅"
152+
149153
add_reply_on_id_input_error = "id输入错误"
150154
add_reply_on_target_parse_input_error = "不能从你的输入中提取出id,请检查你输入的内容是否符合预期"
151155
add_reply_on_platform_input_error = "平台输入错误"

0 commit comments

Comments
 (0)