Merge branch 'dev' into AzideCupric/main

src/plugins/nonebot_bison/config_manager.py

@@ -1,13 +1,18 @@
-from typing import Type
+import asyncio
+from asyncio.tasks import Task
+from datetime import datetime
+from typing import Optional, Type
 
 from nonebot import on_command
-from nonebot.adapters import Event as AbstractEvent
-from nonebot.adapters.onebot.v11 import Bot, Event
+from nonebot.adapters.onebot.v11 import Bot, Event, MessageEvent
+from nonebot.adapters.onebot.v11.event import GroupMessageEvent, PrivateMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebot.adapters.onebot.v11.permission import GROUP_ADMIN, GROUP_OWNER
+from nonebot.internal.params import ArgStr
 from nonebot.internal.rule import Rule
+from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.params import Depends, EventToMe
+from nonebot.params import Depends, EventMessage, EventPlainText, EventToMe
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
 from nonebot.typing import T_State
@@ -15,7 +20,7 @@ from nonebot.typing import T_State
 from .config import Config
 from .platform import check_sub_target, platform_manager
 from .plugin_config import plugin_config
-from .types import Category, Target
+from .types import Category, Target, User
 from .utils import parse_text
 
 
@@ -44,7 +49,28 @@ common_platform = [
 ]
 
 
+def ensure_user_info(matcher: Type[Matcher]):
+    async def _check_user_info(state: T_State):
+        if not state.get("target_user_info"):
+            await matcher.finish(
+                "No target_user_info set, this shouldn't happen, please issue"
+            )
+
+    return _check_user_info
+
+
+async def set_target_user_info(event: MessageEvent, state: T_State):
+    if isinstance(event, GroupMessageEvent):
+        user = User(event.group_id, "group")
+        state["target_user_info"] = user
+    elif isinstance(event, PrivateMessageEvent):
+        user = User(event.user_id, "private")
+        state["target_user_info"] = user
+
+
 def do_add_sub(add_sub: Type[Matcher]):
+    add_sub.handle()(ensure_user_info(add_sub))
+
     @add_sub.handle()
     async def init_promote(state: T_State):
         state["_prompt"] = (
@@ -60,7 +86,7 @@ def do_add_sub(add_sub: Type[Matcher]):
             + "要查看全部平台请输入：“全部”\n中止订阅过程请输入：“取消”"
         )
 
-    async def parse_platform(event: AbstractEvent, state: T_State) -> None:
+    async def parse_platform(event: MessageEvent, state: T_State) -> None:
         if not isinstance(state["platform"], Message):
             return
         platform = str(event.get_message()).strip()
@@ -93,7 +119,7 @@ def do_add_sub(add_sub: Type[Matcher]):
                 Target("")
             )
 
-    async def parse_id(event: AbstractEvent, state: T_State):
+    async def parse_id(event: MessageEvent, state: T_State):
         if not isinstance(state["id"], Message):
             return
         target = str(event.get_message()).strip()
@@ -119,7 +145,7 @@ def do_add_sub(add_sub: Type[Matcher]):
             " ".join(list(platform_manager[state["platform"]].categories.values()))
         )
 
-    async def parser_cats(event: AbstractEvent, state: T_State):
+    async def parser_cats(event: MessageEvent, state: T_State):
         if not isinstance(state["cats"], Message):
             return
         res = []
@@ -138,7 +164,7 @@ def do_add_sub(add_sub: Type[Matcher]):
             return
         state["_prompt"] = '请输入要订阅的tag，订阅所有tag输入"全部标签"'
 
-    async def parser_tags(event: AbstractEvent, state: T_State):
+    async def parser_tags(event: MessageEvent, state: T_State):
         if not isinstance(state["tags"], Message):
             return
         if str(event.get_message()).strip() == "取消":  # 一般不会有叫 取消 的tag吧
@@ -151,9 +177,13 @@ 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(
-            state.get("_user_id") or event.group_id,
-            user_type="group",
+            # state.get("_user_id") or event.group_id,
+            # user_type="group",
+            user=user.user,
+            user_type=user.user_type,
             target=state["id"],
             target_name=state["name"],
             target_type=state["platform"],
@@ -164,11 +194,17 @@ def do_add_sub(add_sub: Type[Matcher]):
 
 
 def do_query_sub(query_sub: Type[Matcher]):
+    query_sub.handle()(ensure_user_info(query_sub))
+
     @query_sub.handle()
-    async def _(event: Event, state: T_State):
+    async def _(state: T_State):
         config: Config = Config()
+        user_info = state["target_user_info"]
+        assert isinstance(user_info, User)
         sub_list = config.list_subscribe(
-            state.get("_user_id") or event.group_id, "group"
+            # state.get("_user_id") or event.group_id, "group"
+            user_info.user,
+            user_info.user_type,
         )
         res = "订阅的帐号为：\n"
         for sub in sub_list:
@@ -189,11 +225,17 @@ def do_query_sub(query_sub: Type[Matcher]):
 
 
 def do_del_sub(del_sub: Type[Matcher]):
+    del_sub.handle()(ensure_user_info(del_sub))
+
     @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(
-            state.get("_user_id") or event.group_id, "group"
+            # state.get("_user_id") or event.group_id, "group"
+            user_info.user,
+            user_info.user_type,
         )
         res = "订阅的帐号为：\n"
         state["sub_table"] = {}
@@ -223,9 +265,13 @@ def do_del_sub(del_sub: Type[Matcher]):
         try:
             index = int(str(event.get_message()).strip())
             config = Config()
+            user_info = state["target_user_info"]
+            assert isinstance(user_info, User)
             config.del_subscribe(
-                state.get("_user_id") or event.group_id,
-                "group",
+                # state.get("_user_id") or event.group_id,
+                # "group",
+                user_info.user,
+                user_info.user_type,
                 **state["sub_table"][index],
             )
         except Exception as e:
@@ -234,41 +280,19 @@ def do_del_sub(del_sub: Type[Matcher]):
             await del_sub.finish("删除成功")
 
 
-async def parse_group_number(event: AbstractEvent, state: T_State):
-    if not isinstance(state["_user_id"], Message):
-        return
-    state["_user_id"] = int(str(event.get_message()))
-
-
 add_sub_matcher = on_command(
     "添加订阅",
     rule=configurable_to_me,
     permission=GROUP_ADMIN | GROUP_OWNER | SUPERUSER,
     priority=5,
 )
+add_sub_matcher.handle()(set_target_user_info)
 do_add_sub(add_sub_matcher)
-manage_add_sub_matcher = on_command("管理-添加订阅", permission=SUPERUSER, priority=5)
-
-
-@manage_add_sub_matcher.got("_user_id", "群号", [Depends(parse_group_number)])
-async def add_sub_handle():
-    pass
-
-
-do_add_sub(manage_add_sub_matcher)
 
 
 query_sub_matcher = on_command("查询订阅", rule=configurable_to_me, priority=5)
+query_sub_matcher.handle()(set_target_user_info)
 do_query_sub(query_sub_matcher)
-manage_query_sub_matcher = on_command("管理-查询订阅", permission=SUPERUSER, priority=5)
-
-
-@manage_query_sub_matcher.got("_user_id", "群号", [Depends(parse_group_number)])
-async def query_sub_handle():
-    pass
-
-
-do_query_sub(manage_query_sub_matcher)
 
 
 del_sub_matcher = on_command(
@@ -277,13 +301,117 @@ del_sub_matcher = on_command(
     permission=GROUP_ADMIN | GROUP_OWNER | SUPERUSER,
     priority=5,
 )
+del_sub_matcher.handle()(set_target_user_info)
 do_del_sub(del_sub_matcher)
-manage_del_sub_matcher = on_command("管理-删除订阅", permission=SUPERUSER, priority=5)
+
+group_manage_matcher = on_command("群管理")
 
 
-@manage_del_sub_matcher.got("_user_id", "群号", [Depends(parse_group_number)])
-async def del_sub_handle():
-    pass
+@group_manage_matcher.handle()
+async def send_group_list(bot: Bot, state: T_State):
+    groups = await bot.call_api("get_group_list")
+    res_text = "请选择需要管理的群：\n"
+    group_number_idx = {}
+    for idx, group in enumerate(groups, 1):
+        group_number_idx[idx] = group["group_id"]
+        res_text += f'{idx}. {group["group_id"]} - {group["group_name"]}\n'
+    res_text += "请输入左侧序号"
+    # await group_manage_matcher.send(res_text)
+    state["_prompt"] = res_text
+    state["group_number_idx"] = group_number_idx
 
 
-do_del_sub(manage_del_sub_matcher)
+async def _parse_group_idx(state: T_State, event_msg: str = EventPlainText()):
+    if not isinstance(state["group_idx"], Message):
+        return
+    group_number_idx: Optional[dict[int, int]] = state.get("group_number_idx")
+    assert group_number_idx
+    try:
+        idx = int(event_msg)
+        assert idx in group_number_idx.keys()
+        state["group_idx"] = idx
+    except:
+        await group_manage_matcher.reject("请输入正确序号")
+
+
+@group_manage_matcher.got(
+    "group_idx", _gen_prompt_template("{_prompt}"), [Depends(_parse_group_idx)]
+)
+async def do_choose_group_number(state: T_State):
+    group_number_idx: dict[int, int] = state["group_number_idx"]
+    idx: int = state["group_idx"]
+    group_id = group_number_idx[idx]
+    state["target_user_info"] = User(user=group_id, user_type="group")
+
+
+async def _check_command(event_msg: str = EventPlainText()):
+    if event_msg not in {"添加订阅", "查询订阅", "删除订阅"}:
+        await group_manage_matcher.reject("请输入正确的命令")
+    return
+
+
+@group_manage_matcher.got(
+    "command", "请输入需要使用的命令：添加订阅，查询订阅，删除订阅", [Depends(_check_command)]
+)
+async def do_dispatch_command(
+    bot: Bot,
+    event: MessageEvent,
+    state: T_State,
+    matcher: Matcher,
+    command: str = ArgStr(),
+):
+    permission = await matcher.update_permission(bot, event)
+    new_matcher = Matcher.new(
+        "message",
+        Rule(),
+        permission,
+        None,
+        True,
+        priority=0,
+        block=True,
+        plugin=matcher.plugin,
+        module=matcher.module,
+        expire_time=datetime.now() + bot.config.session_expire_timeout,
+        default_state=matcher.state,
+        default_type_updater=matcher.__class__._default_type_updater,
+        default_permission_updater=matcher.__class__._default_permission_updater,
+    )
+    if command == "查询订阅":
+        do_query_sub(new_matcher)
+    elif command == "添加订阅":
+        do_add_sub(new_matcher)
+    else:
+        do_del_sub(new_matcher)
+    new_matcher_ins = new_matcher()
+    asyncio.create_task(new_matcher_ins.run(bot, event, state))
+
+
+test_matcher = on_command("testtt")
+
+
+@test_matcher.handle()
+async def _handler(bot: Bot, event: Event, matcher: Matcher, state: T_State):
+    permission = await matcher.update_permission(bot, event)
+    new_matcher = Matcher.new(
+        "message",
+        Rule(),
+        permission,
+        None,
+        True,
+        priority=0,
+        block=True,
+        plugin=matcher.plugin,
+        module=matcher.module,
+        expire_time=datetime.now() + bot.config.session_expire_timeout,
+        default_state=matcher.state,
+        default_type_updater=matcher.__class__._default_type_updater,
+        default_permission_updater=matcher.__class__._default_permission_updater,
+    )
+
+    async def h():
+        logger.warning("yes")
+        await new_matcher.send("666")
+
+    new_matcher.handle()(h)
+    new_matcher_ins = new_matcher()
+    await new_matcher_ins.run(bot, event, state)

src/plugins/nonebot_bison/types.py

@@ -9,7 +9,7 @@ Tag = str
 
 @dataclass(eq=True, frozen=True)
 class User:
-    user: str
+    user: int
     user_type: Literal["group", "private"]