✨ 添加对主流框架的消息io支持

src/utils/base/data.py

@@ -28,7 +28,7 @@ class Database:
             os.makedirs(os.path.dirname(db_name))
 
         self.db_name = db_name
-        self.conn = sqlite3.connect(db_name)
+        self.conn = sqlite3.connect(db_name, check_same_thread=False)
         self.cursor = self.conn.cursor()
 
         self._on_save_callbacks = []
@@ -105,12 +105,12 @@ class Database:
             return [model_type(**self._load(dict(zip(fields, result)))) for result in results]
 
     def save(self, *args: LiteModel):
-        """增/改操作
+        self.returns_ = """增/改操作
         Args:
             *args:
         Returns:
         """
-        table_list = [item[0] for item in self.cursor.execute("SELECT name FROM sqlite_master WHERE type_='table'").fetchall()]
+        table_list = [item[0] for item in self.cursor.execute("SELECT name FROM sqlite_master WHERE type ='table'").fetchall()]
         for model in args:
             logger.debug(f"Upserting {model}")
             if not model.TABLE_NAME:
@@ -433,4 +433,4 @@ def check_sqlite_keyword(name):
     ]
     return True
     # if name.upper() in sqlite_keywords:
-    #     raise ValueError(f"'{name}' 是SQLite保留字，不建议使用，请更换名称")
+    #     raise ValueError(f"'{name}' 是SQLite保留字，不建议使用，请更换名称")

src/utils/base/data_manager.py

@@ -65,7 +65,7 @@ def auto_migrate():
     user_db.auto_migrate(User())
     group_db.auto_migrate(Group())
     plugin_db.auto_migrate(InstalledPlugin(), GlobalPlugin())
-    common_db.auto_migrate(GlobalPlugin(), StoredConfig(), TempConfig())
+    common_db.auto_migrate(GlobalPlugin(), TempConfig())
 
 
 auto_migrate()

src/utils/event/get_info.py

@@ -1,6 +1,6 @@
 from nonebot.adapters import satori
-
-from src.utils.base.ly_typing import T_MessageEvent
+from nonebot.adapters import onebot
+from src.utils.base.ly_typing import T_MessageEvent, T_GroupMessageEvent
 
 
 def get_user_id(event: T_MessageEvent):
@@ -10,11 +10,13 @@ def get_user_id(event: T_MessageEvent):
         return event.user_id
 
 
-def get_group_id(event: T_MessageEvent):
+def get_group_id(event: T_GroupMessageEvent):
     if isinstance(event, satori.event.Event):
         return event.guild.id
-    else:
+    elif isinstance(event, onebot.v11.GroupMessageEvent):
         return event.group_id
+    else:
+        return None
 
 
 def get_message_type(event: T_MessageEvent) -> str:

src/utils/message/message.py

@@ -83,14 +83,14 @@ class MarkdownMessage:
                 "send_private_forward_msg",
                 messages=[
                     {
-                        "type_": "node",
+                        "type": "node",
                         "data": {
                             "content": [
                                 {
                                     "data": {
                                         "content": "{\"content\":\"%s\"}" % formatted_md,
                                     },
-                                    "type_": "markdown"
+                                    "type": "markdown"
                                 }
                             ],
                             "name": "[]",
@@ -107,7 +107,7 @@ class MarkdownMessage:
                 message_type=message_type,
                 message=[
                     {
-                        "type_": "longmsg",
+                        "type": "longmsg",
                         "data": {
                             "id": forward_id
                         }
@@ -156,7 +156,7 @@ class MarkdownMessage:
         Args:
             image: 图片字节流或图片本地路径，链接请使用Markdown.image_async方法获取后通过send_md发送
             bot: bot instance
-            message_type: message type_
+            message_type: message type
             session_id: session id
             event: event
             kwargs: other arguments