suyiiyii/nonebot-bison
1
0
Fork 0
mirror of https://github.com/suyiiyii/nonebot-bison.git synced 2025-06-07 20:33:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🚚 rename config_manager to sub_manager

Browse Source
This commit is contained in:
felinae98 2023-06-11 15:26:52 +08:00
parent 9f1730093c
commit a1b4f2fb27
11 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nonebot_bison/__init__.py
View File

@ -10,11 +10,11 @@ from . import (
admin_page, admin_page,
bootstrap, bootstrap,
config, config,
config_manager,
platform, platform,
post, post,
scheduler, scheduler,
send, send,
sub_manager,
types, types,
utils, utils,
) )
@ -38,7 +38,7 @@ __plugin_meta__ = PluginMetadata(
__all__ = [ __all__ = [
"admin_page", "admin_page",
"config", "config",
"config_manager", "sub_manager",
"post", "post",
"scheduler", "scheduler",
"send", "send",

0
nonebot_bison/config_manager/__init__.py → nonebot_bison/sub_manager/__init__.py
View File

0
nonebot_bison/config_manager/add_sub.py → nonebot_bison/sub_manager/add_sub.py
View File

0
nonebot_bison/config_manager/del_sub.py → nonebot_bison/sub_manager/del_sub.py
View File

0
nonebot_bison/config_manager/query_sub.py → nonebot_bison/sub_manager/query_sub.py
View File

0
nonebot_bison/config_manager/utils.py → nonebot_bison/sub_manager/utils.py
View File

0
tests/sub_manager/__init__.py Normal file
View File

14
tests/test_config_manager_abort.py → tests/sub_manager/test_abort.py
View File

@ -4,8 +4,8 @@ from httpx import Response
from nonebug.app import App from nonebug.app import App
from nonebug_saa import should_send_saa from nonebug_saa import should_send_saa
from .platforms.utils import get_json from ..platforms.utils import get_json
from .utils import BotReply, fake_admin_user, fake_group_message_event from ..utils import BotReply, fake_admin_user, fake_group_message_event
# 选择platform阶段中止 # 选择platform阶段中止
@ -15,8 +15,8 @@ async def test_abort_add_on_platform(app: App, init_scheduler):
from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.event import Sender
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937"
@ -63,9 +63,9 @@ async def test_abort_add_on_id(app: App, init_scheduler):
from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.event import Sender
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.weibo import Weibo from nonebot_bison.platform.weibo import Weibo
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937"
@ -121,9 +121,9 @@ async def test_abort_add_on_cats(app: App, init_scheduler):
from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.event import Sender
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.weibo import Weibo from nonebot_bison.platform.weibo import Weibo
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937"
@ -197,9 +197,9 @@ async def test_abort_add_on_tag(app: App, init_scheduler):
from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.event import Sender
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.weibo import Weibo from nonebot_bison.platform.weibo import Weibo
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937"
@ -279,8 +279,8 @@ async def test_abort_del_sub(app: App, init_scheduler):
from nonebot_plugin_saa import MessageFactory, TargetQQGroup from nonebot_plugin_saa import MessageFactory, TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import del_sub_matcher
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.sub_manager import del_sub_matcher
from nonebot_bison.types import Target as T_Target from nonebot_bison.types import Target as T_Target
await config.add_subscribe( await config.add_subscribe(

24
tests/test_config_manager_add.py → tests/sub_manager/test_add.py
View File

@ -5,8 +5,8 @@ from nonebug.app import App
from nonebug_saa import should_send_saa from nonebug_saa import should_send_saa
from pytest_mock import MockerFixture from pytest_mock import MockerFixture
from .platforms.utils import get_json from ..platforms.utils import get_json
from .utils import ( from ..utils import (
BotReply, BotReply,
add_reply_on_id_input_search, add_reply_on_id_input_search,
fake_admin_user, fake_admin_user,
@ -19,8 +19,8 @@ async def test_configurable_at_me_true_failed(app: App):
from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.bot import Bot
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import add_sub_matcher
from nonebot_bison.plugin_config import plugin_config from nonebot_bison.plugin_config import plugin_config
from nonebot_bison.sub_manager import add_sub_matcher
plugin_config.bison_to_me = True plugin_config.bison_to_me = True
async with app.test_matcher(add_sub_matcher) as ctx: async with app.test_matcher(add_sub_matcher) as ctx:
@ -45,9 +45,9 @@ async def test_configurable_at_me_false(app: App):
from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.bot import Bot
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.plugin_config import plugin_config from nonebot_bison.plugin_config import plugin_config
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
plugin_config.bison_to_me = False plugin_config.bison_to_me = False
async with app.test_matcher(add_sub_matcher) as ctx: async with app.test_matcher(add_sub_matcher) as ctx:
@ -73,9 +73,9 @@ async def test_add_with_target(app: App, init_scheduler):
from nonebot_plugin_saa import TargetQQGroup from nonebot_plugin_saa import TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.weibo import Weibo from nonebot_bison.platform.weibo import Weibo
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937"
@ -196,9 +196,9 @@ async def test_add_with_target_no_cat(app: App, init_scheduler):
from nonebot_plugin_saa import TargetQQGroup from nonebot_plugin_saa import TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.ncm import NcmArtist from nonebot_bison.platform.ncm import NcmArtist
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ncm_router = respx.get("https://music.163.com/api/artist/albums/32540734") ncm_router = respx.get("https://music.163.com/api/artist/albums/32540734")
ncm_router.mock(return_value=Response(200, json=get_json("ncm_siren.json"))) ncm_router.mock(return_value=Response(200, json=get_json("ncm_siren.json")))
@ -257,8 +257,8 @@ async def test_add_no_target(app: App, init_scheduler):
from nonebot_plugin_saa import TargetQQGroup from nonebot_plugin_saa import TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
async with app.test_matcher(add_sub_matcher) as ctx: async with app.test_matcher(add_sub_matcher) as ctx:
bot = ctx.create_bot() bot = ctx.create_bot()
@ -306,8 +306,8 @@ async def test_platform_name_err(app: App):
from nonebot.adapters.onebot.v11.event import Sender from nonebot.adapters.onebot.v11.event import Sender
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
async with app.test_matcher(add_sub_matcher) as ctx: async with app.test_matcher(add_sub_matcher) as ctx:
bot = ctx.create_bot() bot = ctx.create_bot()
@ -350,9 +350,9 @@ async def test_add_with_get_id(app: App):
) )
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.weibo import Weibo from nonebot_bison.platform.weibo import Weibo
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937" "https://m.weibo.cn/api/container/getIndex?containerid=1005056279793937"
@ -432,9 +432,9 @@ async def test_add_with_bilibili_target_parser(app: App, init_scheduler):
from nonebot_plugin_saa import TargetQQGroup from nonebot_plugin_saa import TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.bilibili import Bilibili from nonebot_bison.platform.bilibili import Bilibili
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://api.bilibili.com/x/web-interface/card?mid=161775300" "https://api.bilibili.com/x/web-interface/card?mid=161775300"
@ -554,9 +554,9 @@ async def test_add_with_bilibili_live_target_parser(app: App, init_scheduler):
from nonebot_plugin_saa import TargetQQGroup from nonebot_plugin_saa import TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.bilibili import Bilibililive from nonebot_bison.platform.bilibili import Bilibililive
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://api.bilibili.com/x/web-interface/card?mid=161775300" "https://api.bilibili.com/x/web-interface/card?mid=161775300"
@ -647,9 +647,9 @@ async def test_add_with_bilibili_bangumi_target_parser(app: App, init_scheduler)
from nonebot_plugin_saa import TargetQQGroup from nonebot_plugin_saa import TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import add_sub_matcher, common_platform
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.platform.bilibili import BilibiliBangumi from nonebot_bison.platform.bilibili import BilibiliBangumi
from nonebot_bison.sub_manager import add_sub_matcher, common_platform
ak_list_router = respx.get( ak_list_router = respx.get(
"https://api.bilibili.com/pgc/review/user?media_id=28235413" "https://api.bilibili.com/pgc/review/user?media_id=28235413"

10
tests/test_config_manager_admin.py → tests/sub_manager/test_admin.py
View File

@ -1,7 +1,7 @@
import pytest import pytest
from nonebug import App from nonebug import App
from .utils import fake_group_message_event, fake_private_message_event, fake_superuser from ..utils import fake_group_message_event, fake_private_message_event, fake_superuser
@pytest.mark.asyncio @pytest.mark.asyncio
@ -9,7 +9,7 @@ async def test_query_with_superuser_private(app: App):
from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.bot import Bot
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import group_manage_matcher from nonebot_bison.sub_manager import group_manage_matcher
async with app.test_matcher(group_manage_matcher) as ctx: async with app.test_matcher(group_manage_matcher) as ctx:
bot = ctx.create_bot(base=Bot) bot = ctx.create_bot(base=Bot)
@ -72,7 +72,7 @@ async def test_query_with_abort_on_idx(app: App):
from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.bot import Bot
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import group_manage_matcher from nonebot_bison.sub_manager import group_manage_matcher
async with app.test_matcher(group_manage_matcher) as ctx: async with app.test_matcher(group_manage_matcher) as ctx:
bot = ctx.create_bot(base=Bot) bot = ctx.create_bot(base=Bot)
@ -108,7 +108,7 @@ async def test_query_with_abort_on_command(app: App):
from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.bot import Bot
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import group_manage_matcher from nonebot_bison.sub_manager import group_manage_matcher
async with app.test_matcher(group_manage_matcher) as ctx: async with app.test_matcher(group_manage_matcher) as ctx:
bot = ctx.create_bot(base=Bot) bot = ctx.create_bot(base=Bot)
@ -153,7 +153,7 @@ async def test_query_with_superuser_group_tome(app: App):
from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.bot import Bot
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config_manager import group_manage_matcher from nonebot_bison.sub_manager import group_manage_matcher
async with app.test_matcher(group_manage_matcher) as ctx: async with app.test_matcher(group_manage_matcher) as ctx:
bot = ctx.create_bot(base=Bot) bot = ctx.create_bot(base=Bot)

12
tests/test_config_manager_query_del.py → tests/sub_manager/test_query_del.py
View File

@ -1,11 +1,9 @@
import pytest import pytest
import respx
from httpx import Response
from nonebug.app import App from nonebug.app import App
from nonebug_saa import should_send_saa from nonebug_saa import should_send_saa
from .platforms.utils import get_json from ..platforms.utils import get_json
from .utils import fake_admin_user, fake_group_message_event from ..utils import fake_admin_user, fake_group_message_event
@pytest.mark.asyncio @pytest.mark.asyncio
@ -15,8 +13,8 @@ async def test_query_sub(app: App, init_scheduler):
from nonebot_plugin_saa import MessageFactory, SupportedAdapters, TargetQQGroup from nonebot_plugin_saa import MessageFactory, SupportedAdapters, TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import query_sub_matcher
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.sub_manager import query_sub_matcher
from nonebot_bison.types import Target from nonebot_bison.types import Target
await config.add_subscribe( await config.add_subscribe(
@ -49,8 +47,8 @@ async def test_del_sub(app: App, init_scheduler):
from nonebot_plugin_saa import MessageFactory, TargetQQGroup from nonebot_plugin_saa import MessageFactory, TargetQQGroup
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import del_sub_matcher
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.sub_manager import del_sub_matcher
from nonebot_bison.types import Target from nonebot_bison.types import Target
await config.add_subscribe( await config.add_subscribe(
@ -100,8 +98,8 @@ async def test_del_empty_sub(app: App, init_scheduler):
from nonebot.adapters.onebot.v11.message import Message from nonebot.adapters.onebot.v11.message import Message
from nonebot_bison.config import config from nonebot_bison.config import config
from nonebot_bison.config_manager import del_sub_matcher
from nonebot_bison.platform import platform_manager from nonebot_bison.platform import platform_manager
from nonebot_bison.sub_manager import del_sub_matcher
async with app.test_matcher(del_sub_matcher) as ctx: async with app.test_matcher(del_sub_matcher) as ctx:
bot = ctx.create_bot(base=Bot) bot = ctx.create_bot(base=Bot)