fit nonebot.beta2

basic_plugins/hooks/_utils.py

@@ -1,48 +1,48 @@
-from nonebot.adapters.cqhttp import GroupMessageEvent, PrivateMessageEvent
-from utils.manager import plugins2block_manager, StaticData
-import time
-
-
-class StatusMessageManager(StaticData):
-
-    def __init__(self):
-        super().__init__(None)
-
-    def add(self, id_: int):
-        self._data[id_] = time.time()
-
-    def delete(self, id_: int):
-        if self._data.get(id_):
-            del self._data[id_]
-
-    def check(self, id_: int, t: int = 30) -> bool:
-        if self._data.get(id_):
-            if time.time() - self._data[id_] > t:
-                del self._data[id_]
-                return True
-            return False
-        return True
-
-
-status_message_manager = StatusMessageManager()
-
-
-def set_block_limit_false(event, module):
-    """
-    设置用户block为false
-    :param event: event
-    :param module: 插件模块
-    """
-    if plugins2block_manager.check_plugin_block_status(module):
-        plugin_block_data = plugins2block_manager.get_plugin_block_data(module)
-        check_type = plugin_block_data["check_type"]
-        limit_type = plugin_block_data["limit_type"]
-        if not (
-            (isinstance(event, GroupMessageEvent) and check_type == "private")
-            or (isinstance(event, PrivateMessageEvent) and check_type == "group")
-        ):
-            block_type_ = event.user_id
-            if limit_type == "group" and isinstance(event, GroupMessageEvent):
-                block_type_ = event.group_id
-            plugins2block_manager.set_false(block_type_, module)
-
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, PrivateMessageEvent
+from utils.manager import plugins2block_manager, StaticData
+import time
+
+
+class StatusMessageManager(StaticData):
+
+    def __init__(self):
+        super().__init__(None)
+
+    def add(self, id_: int):
+        self._data[id_] = time.time()
+
+    def delete(self, id_: int):
+        if self._data.get(id_):
+            del self._data[id_]
+
+    def check(self, id_: int, t: int = 30) -> bool:
+        if self._data.get(id_):
+            if time.time() - self._data[id_] > t:
+                del self._data[id_]
+                return True
+            return False
+        return True
+
+
+status_message_manager = StatusMessageManager()
+
+
+def set_block_limit_false(event, module):
+    """
+    设置用户block为false
+    :param event: event
+    :param module: 插件模块
+    """
+    if plugins2block_manager.check_plugin_block_status(module):
+        plugin_block_data = plugins2block_manager.get_plugin_block_data(module)
+        check_type = plugin_block_data["check_type"]
+        limit_type = plugin_block_data["limit_type"]
+        if not (
+            (isinstance(event, GroupMessageEvent) and check_type == "private")
+            or (isinstance(event, PrivateMessageEvent) and check_type == "group")
+        ):
+            block_type_ = event.user_id
+            if limit_type == "group" and isinstance(event, GroupMessageEvent):
+                block_type_ = event.group_id
+            plugins2block_manager.set_false(block_type_, module)
+

basic_plugins/hooks/auth_hook.py

@@ -1,6 +1,6 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, run_postprocessor, IgnoredException
-from nonebot.adapters.cqhttp.exception import ActionFailed
+from nonebot.adapters.onebot.v11.exception import ActionFailed
 from models.friend_user import FriendUser
 from models.group_member_info import GroupInfoUser
 from models.bag_user import BagUser
@@ -13,10 +13,10 @@ from utils.manager import (
     plugins2block_manager,
     plugins2count_manager
 )
-from .utils import set_block_limit_false, status_message_manager
+from ._utils import set_block_limit_false, status_message_manager
 from nonebot.typing import T_State
 from typing import Optional
-from nonebot.adapters.cqhttp import (
+from nonebot.adapters.onebot.v11 import (
     Bot,
     MessageEvent,
     GroupMessageEvent,
@@ -43,7 +43,7 @@ ignore_rst_module = ["ai", "poke", "dialogue"]
 # 权限检测
 @run_preprocessor
 async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
-    module = matcher.module
+    module = matcher.plugin_name
     plugins2info_dict = plugins2settings_manager.get_data()
     # 功能的金币检测 #######################################
     # 功能的金币检测 #######################################
@@ -83,7 +83,7 @@ async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
     except AttributeError:
         pass
     # 群黑名单检测 群总开关检测
-    if isinstance(event, GroupMessageEvent) or matcher.module == "poke":
+    if isinstance(event, GroupMessageEvent) or matcher.plugin_name == "poke":
         try:
             if group_manager.get_group_level(event.group_id) < 0:
                 raise IgnoredException("群黑名单")
@@ -354,15 +354,15 @@ async def _(
     event: Event,
     state: T_State,
 ):
-    if not isinstance(event, MessageEvent) and matcher.module != "poke":
+    if not isinstance(event, MessageEvent) and matcher.plugin_name != "poke":
         return
-    module = matcher.module
+    module = matcher.plugin_name
     set_block_limit_false(event, module)
 
 
 async def init_rst(rst: str, event: MessageEvent):
     if "[uname]" in rst:
-        uname = event.sender.card if event.sender.card else event.sender.nickname
+        uname = event.sender.card or event.sender.nickname
         rst = rst.replace("[uname]", uname)
     if "[nickname]" in rst:
         if isinstance(event, GroupMessageEvent):

basic_plugins/hooks/ban_hook.py

@@ -1,8 +1,8 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
-from nonebot.adapters.cqhttp.exception import ActionFailed
+from nonebot.adapters.onebot.v11.exception import ActionFailed
 from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import (
+from nonebot.adapters.onebot.v11 import (
     Bot,
     MessageEvent,
     GroupMessageEvent,
@@ -83,4 +83,4 @@ async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
                             )
                     except ActionFailed:
                         pass
-            raise IgnoredException("用户处于黑名单中")
+            raise IgnoredException("用户处于黑名单中")

basic_plugins/hooks/chkdsk_hook.py

@@ -1,8 +1,8 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
-from nonebot.adapters.cqhttp.exception import ActionFailed
+from nonebot.adapters.onebot.v11.exception import ActionFailed
 from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import (
+from nonebot.adapters.onebot.v11 import (
     Bot,
     MessageEvent,
     GroupMessageEvent,

basic_plugins/hooks/other_hook.py

@@ -1,8 +1,8 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
 from nonebot.typing import T_State
-from .utils import status_message_manager
-from nonebot.adapters.cqhttp import (
+from ._utils import status_message_manager
+from nonebot.adapters.onebot.v11 import (
     Bot,
     MessageEvent,
     PrivateMessageEvent,
@@ -24,7 +24,7 @@ async def _(matcher: Matcher, bot: Bot, event: PrivateMessageEvent, state: T_Sta
 async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
     if not isinstance(event, MessageEvent):
         return
-    if matcher.type == "message" and matcher.module == "ai":
+    if matcher.type == "message" and matcher.plugin_name == "ai":
         if (
             isinstance(event, GroupMessageEvent)
             and not status_message_manager.check(event.group_id)
@@ -35,7 +35,6 @@ async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
             isinstance(event, PrivateMessageEvent)
             and not status_message_manager.check(event.user_id)
         ):
-            print(status_message_manager)
             status_message_manager.delete(event.user_id)
             raise IgnoredException("有命令就别说话了")
 

basic_plugins/hooks/task_hook.py

@@ -0,0 +1,24 @@
+from nonebot.exception import MockApiException
+from nonebot.adapters.onebot.v11 import Bot, MessageSegment
+from utils.manager import group_manager
+from utils.utils import get_message_text
+from typing import Dict, Any
+import re
+
+
+@Bot.on_calling_api
+async def handle_api_call(bot: Bot, api: str, data: Dict[str, Any]):
+    r = None
+    if (
+        (api == "send_msg" and data["message"] == "group_id" or api == "send_group_msg")
+        and (r := re.search("^\[\[_task\|(.*)]]", get_message_text(data["message"])))
+        and r.group(1) in group_manager.get_task_data().keys()
+    ):
+        task = r.group(1)
+        group_id = data["group_id"]
+        if not await group_manager.check_group_task_status(group_id, task):
+            raise MockApiException(f"被动技能 {task} 处于关闭状态...")
+        else:
+            msg = str(data["message"][0])
+            msg = msg.replace(f"[[_task|{task}]]", "")
+            data["message"][0] = MessageSegment.text(msg)

basic_plugins/hooks/withdraw_message_hook.py

@@ -2,7 +2,7 @@ from nonebot.matcher import Matcher
 from nonebot.message import run_postprocessor
 from typing import Optional
 from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, Event
+from nonebot.adapters.onebot.v11 import Bot, Event
 from utils.manager import withdraw_message_manager
 import asyncio
 
@@ -25,4 +25,4 @@ async def _(
 
 async def _withdraw_message(bot: Bot, id_: int, time: int):
     await asyncio.sleep(time)
-    await bot.delete_msg(message_id=id_, self_id=int(bot.self_id))
+    await bot.delete_msg(message_id=id_)