From 77752fa17958b8263b85224f0e0374bf5ac5b31e Mon Sep 17 00:00:00 2001
From: felinae98 <731499577@qq.com>
Date: Tue, 22 Mar 2022 20:08:01 +0800
Subject: [PATCH] fix merge

---
 src/plugins/nonebot_bison/config_manager.py |  6 +-----
 tests/test_config_manager_add.py            | 15 +++++----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py
index 931bf3e..dc12594 100644
--- a/src/plugins/nonebot_bison/config_manager.py
+++ b/src/plugins/nonebot_bison/config_manager.py
@@ -16,7 +16,7 @@ from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
 from nonebot.typing import T_State
 
-from .config import Config
+from .config import config
 from .platform import check_sub_target, platform_manager
 from .plugin_config import plugin_config
 from .types import Category, Target, User
@@ -188,7 +188,6 @@ def do_add_sub(add_sub: Type[Matcher]):
 
     @add_sub.got("tags", _gen_prompt_template("{_prompt}"), [Depends(parser_tags)])
     async def add_sub_process(event: Event, state: T_State):
-        config = Config()
         user = state.get("target_user_info")
         assert isinstance(user, User)
         config.add_subscribe(
@@ -210,7 +209,6 @@ def do_query_sub(query_sub: Type[Matcher]):
 
     @query_sub.handle()
     async def _(state: T_State):
-        config: Config = Config()
         user_info = state["target_user_info"]
         assert isinstance(user_info, User)
         sub_list = config.list_subscribe(
@@ -241,7 +239,6 @@ def do_del_sub(del_sub: Type[Matcher]):
 
     @del_sub.handle()
     async def send_list(bot: Bot, event: Event, state: T_State):
-        config: Config = Config()
         user_info = state["target_user_info"]
         assert isinstance(user_info, User)
         sub_list = config.list_subscribe(
@@ -276,7 +273,6 @@ def do_del_sub(del_sub: Type[Matcher]):
     async def do_del(event: Event, state: T_State):
         try:
             index = int(str(event.get_message()).strip())
-            config = Config()
             user_info = state["target_user_info"]
             assert isinstance(user_info, User)
             config.del_subscribe(
diff --git a/tests/test_config_manager_add.py b/tests/test_config_manager_add.py
index a38a1a8..2d7af46 100644
--- a/tests/test_config_manager_add.py
+++ b/tests/test_config_manager_add.py
@@ -61,11 +61,10 @@ async def test_configurable_at_me_false(app: App):
 async def test_add_with_target(app: App):
     from nonebot.adapters.onebot.v11.event import Sender
     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 add_sub_matcher, common_platform
     from nonebot_bison.platform import platform_manager
 
-    config = Config()
     config.user_target.truncate()
 
     ak_list_router = respx.get(
@@ -178,11 +177,10 @@ async def test_add_with_target(app: App):
 async def test_add_with_target_no_cat(app: App):
     from nonebot.adapters.onebot.v11.event import Sender
     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 add_sub_matcher, common_platform
     from nonebot_bison.platform import platform_manager
 
-    config = Config()
     config.user_target.truncate()
 
     ncm_router = respx.get("https://music.163.com/api/artist/albums/32540734")
@@ -239,11 +237,10 @@ async def test_add_with_target_no_cat(app: App):
 async def test_add_no_target(app: App):
     from nonebot.adapters.onebot.v11.event import Sender
     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 add_sub_matcher, common_platform
     from nonebot_bison.platform import platform_manager
 
-    config = Config()
     config.user_target.truncate()
 
     async with app.test_matcher(add_sub_matcher) as ctx:
@@ -291,11 +288,10 @@ async def test_add_no_target(app: App):
 async def test_platform_name_err(app: App):
     from nonebot.adapters.onebot.v11.event import Sender
     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 add_sub_matcher, common_platform
     from nonebot_bison.platform import platform_manager
 
-    config = Config()
     config.user_target.truncate()
     async with app.test_matcher(add_sub_matcher) as ctx:
         bot = ctx.create_bot()
@@ -329,11 +325,10 @@ async def test_platform_name_err(app: App):
 async def test_add_with_get_id(app: App):
     from nonebot.adapters.onebot.v11.event import Sender
     from nonebot.adapters.onebot.v11.message import Message, MessageSegment
-    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
 
-    config = Config()
     config.user_target.truncate()
 
     ak_list_router = respx.get(