Skip to content

Commit eccf0e3

Browse files
committed
🐛 forbid adding platform that needs browser in no-browser env
1 parent 67983bd commit eccf0e3

File tree

4 files changed

+67
-1
lines changed

4 files changed

+67
-1
lines changed

nonebot_bison/platform/__init__.py

+14
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from collections import defaultdict
44
from importlib import import_module
55

6+
from ..plugin_config import plugin_config
67
from .platform import Platform, make_no_target_group
78

89
_package_dir = str(Path(__file__).resolve().parent)
@@ -22,3 +23,16 @@
2223
platform_manager[name] = platform_list[0]
2324
else:
2425
platform_manager[name] = make_no_target_group(platform_list)
26+
27+
# platform => reason for not available
28+
unavailable_paltforms: dict[str, str] = {}
29+
30+
31+
def _refresh_unavailable_platforms():
32+
unavailable_paltforms.clear()
33+
for name, platform in platform_manager.items():
34+
if platform.site.require_browser and not plugin_config.bison_use_browser:
35+
unavailable_paltforms[name] = "需要启用 bison_use_browser"
36+
37+
38+
_refresh_unavailable_platforms()

nonebot_bison/sub_manager/add_sub.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from ..types import Target
1010
from ..config import config
1111
from ..apis import check_sub_target
12-
from ..platform import Platform, platform_manager
1312
from ..config.db_config import SubscribeDupException
1413
from .utils import common_platform, ensure_user_info, gen_handle_cancel
14+
from ..platform import Platform, platform_manager, unavailable_paltforms
1515

1616

1717
def do_add_sub(add_sub: type[Matcher]):
@@ -39,6 +39,8 @@ async def parse_platform(state: T_State, platform: str = ArgPlainText()) -> None
3939
elif platform == "取消":
4040
await add_sub.finish("已中止订阅")
4141
elif platform in platform_manager:
42+
if platform in unavailable_paltforms:
43+
await add_sub.finish(f"无法订阅 {platform}{unavailable_paltforms[platform]}")
4244
state["platform"] = platform
4345
else:
4446
await add_sub.reject("平台输入错误")

tests/sub_manager/test_add.py

+46
Original file line numberDiff line numberDiff line change
@@ -615,3 +615,49 @@ 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.plugin_config import plugin_config
626+
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
627+
from nonebot_bison.platform import platform_manager, unavailable_paltforms, _refresh_unavailable_platforms
628+
629+
mocker.patch.object(plugin_config, "bison_use_browser", False)
630+
631+
_refresh_unavailable_platforms()
632+
633+
async with app.test_matcher(add_sub_matcher) as ctx:
634+
bot = ctx.create_bot()
635+
event_1 = fake_group_message_event(
636+
message=Message("添加订阅"),
637+
sender=Sender(card="", nickname="test", role="admin"),
638+
to_me=True,
639+
)
640+
ctx.receive_event(bot, event_1)
641+
ctx.should_pass_rule()
642+
ctx.should_call_send(
643+
event_1,
644+
BotReply.add_reply_on_platform(platform_manager=platform_manager, common_platform=common_platform),
645+
True,
646+
)
647+
event_2 = fake_group_message_event(
648+
message=Message("全部"), sender=Sender(card="", nickname="test", role="admin")
649+
)
650+
ctx.receive_event(bot, event_2)
651+
ctx.should_rejected()
652+
ctx.should_call_send(
653+
event_2,
654+
BotReply.add_reply_on_platform_input_allplatform(platform_manager),
655+
True,
656+
)
657+
event_3 = fake_group_message_event(message=Message("bilibili"), sender=fake_admin_user)
658+
ctx.receive_event(bot, event_3)
659+
ctx.should_call_send(
660+
event_3,
661+
BotReply.add_reply_platform_unavailable("bilibili", unavailable_paltforms["bilibili"]),
662+
True,
663+
)

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_platform_unavailable(platform: str, reason: str) -> str:
151+
return f"无法订阅 {platform}{reason}"
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)