Merge remote-tracking branch 'origin/main'

liteyuki/utils/adapter_manager/__init__.py

@@ -0,0 +1,14 @@
+from . import (
+    satori,
+    onebot
+)
+
+
+def init(config: dict):
+    onebot.init()
+    satori.init(config)
+
+
+def register():
+    onebot.register()
+    satori.register()

liteyuki/utils/adapter_manager/onebot.py

@@ -0,0 +1,12 @@
+import nonebot
+from nonebot.adapters.onebot import v11, v12
+
+
+def init():
+    pass
+
+
+def register():
+    driver = nonebot.get_driver()
+    driver.register_adapter(v11.Adapter)
+    driver.register_adapter(v12.Adapter)

liteyuki/utils/adapter_manager/satori.py

@@ -0,0 +1,26 @@
+import json
+import os
+
+import nonebot
+from nonebot.adapters import satori
+
+
+def init(config: dict):
+    if config.get("satori", None) is None:
+        nonebot.logger.info("Satori config not found, skip Satori init.")
+        return None
+    satori_config = config.get("satori")
+    if not satori_config.get("enable", False):
+        nonebot.logger.info("Satori not enabled, skip Satori init.")
+        return None
+    if os.getenv("SATORI_CLIENTS", None) is not None:
+        nonebot.logger.info("Satori clients already set in environment variable, skip.")
+    os.environ["SATORI_CLIENTS"] = json.dumps(satori_config.get("hosts", []), ensure_ascii=False)
+    config['satori_clients'] = satori_config.get("hosts", [])
+    return
+
+
+def register():
+    if os.getenv("SATORI_CLIENTS", None) is not None:
+        driver = nonebot.get_driver()
+        driver.register_adapter(satori.Adapter)

liteyuki/utils/base/config.py

@@ -1,4 +1,5 @@
 import os
+from typing import List
 
 import nonebot
 import yaml
@@ -11,12 +12,26 @@ from ..message.tools import random_hex_string
 config = {}  # 全局配置，确保加载后读取
 
 
+class SatoriNodeConfig(BaseModel):
+    host: str = ""
+    port: str = "5500"
+    path: str = ""
+    token: str = ""
+
+
+class SatoriConfig(BaseModel):
+    comment: str = "These features are still in development. Do not enable in production environment."
+    enable: bool = False
+    hosts: List[SatoriNodeConfig] = [SatoriNodeConfig()]
+
+
 class BasicConfig(BaseModel):
     host: str = "127.0.0.1"
     port: int = 20216
     superusers: list[str] = []
     command_start: list[str] = ["/", ""]
     nickname: list[str] = [f"LiteyukiBot-{random_hex_string(6)}"]
+    satori: SatoriConfig = SatoriConfig()
 
 
 def load_from_yaml(file: str) -> dict:

liteyuki/utils/base/ly_typing.py

@@ -4,5 +4,5 @@ from nonebot.adapters import satori
 T_Bot = v11.Bot | v12.Bot | satori.Bot
 T_GroupMessageEvent = v11.GroupMessageEvent | v12.GroupMessageEvent
 T_PrivateMessageEvent = v11.PrivateMessageEvent | v12.PrivateMessageEvent
-T_MessageEvent = v11.MessageEvent | v12.MessageEvent # | satori.MessageEvent
+T_MessageEvent = v11.MessageEvent | v12.MessageEvent | satori.MessageEvent
 T_Message = v11.Message | v12.Message | satori.Message

liteyuki/utils/driver_manager/__init__.py

@@ -0,0 +1,6 @@
+from .auto_set_env import auto_set_env
+
+
+def init(config: dict):
+    auto_set_env(config)
+    return

liteyuki/utils/driver_manager/auto_set_env.py

@@ -0,0 +1,21 @@
+import os
+
+import dotenv
+import nonebot
+
+from .defines import *
+
+
+def auto_set_env(config: dict):
+    dotenv.load_dotenv(".env")
+    if os.getenv("DRIVER", None) is not None:
+        print(os.getenv("DRIVER"))
+        nonebot.logger.info("Driver already set in environment variable, skip auto configure.")
+        return
+    if config.get("satori", {'enable': False}).get("enable", False):
+        os.environ["DRIVER"] = get_driver_string(ASGI_DRIVER, HTTPX_DRIVER, WEBSOCKETS_DRIVER)
+        nonebot.logger.info("Enable Satori, set driver to ASGI+HTTPX+WEBSOCKETS")
+    else:
+        os.environ["DRIVER"] = get_driver_string(ASGI_DRIVER)
+        nonebot.logger.info("Disable Satori, set driver to ASGI")
+    return

liteyuki/utils/driver_manager/defines.py

@@ -0,0 +1,17 @@
+ASGI_DRIVER = "~fastapi"
+HTTPX_DRIVER = "~httpx"
+WEBSOCKETS_DRIVER = "~websockets"
+
+
+def get_driver_string(*argv):
+    output_string = ""
+    if ASGI_DRIVER in argv:
+        output_string += ASGI_DRIVER
+    for arg in argv:
+        if arg != ASGI_DRIVER:
+            output_string = f"{output_string}+{arg}"
+    return output_string
+
+
+def get_driver_full_string(*argv):
+    return f"DRIVER={get_driver_string(argv)}"

liteyuki/utils/event/__init__.py

@@ -0,0 +1 @@
+from .get_info import *

liteyuki/utils/event/get_info.py

@@ -15,3 +15,10 @@ def get_group_id(event: T_MessageEvent):
         return event.guild.id
     else:
         return event.group_id
+
+
+def get_message_type(event: T_MessageEvent) -> str:
+    if isinstance(event, satori.event.Event):
+        return "private" if event.guild is None else "group"
+    else:
+        return event.message_type

liteyuki/utils/satori_utils/__init__.py

@@ -1,5 +1,3 @@
 from .user_info import user_infos
-from .get_message_type import get_message_type
-from .event_tools import *
 from .count_friends import count_friends
 from .count_groups import count_groups

liteyuki/utils/satori_utils/get_message_type.py

@@ -1,10 +0,0 @@
-from nonebot.adapters import satori
-
-from liteyuki.utils.base.ly_typing import T_MessageEvent
-
-
-def get_message_type(event: T_MessageEvent) -> str:
-    if isinstance(event, satori.event.Event):
-        return "private" if event.guild is None else "group"
-    else:
-        return event.message_type

liteyuki/utils/satori_utils/user_info.py

@@ -28,8 +28,34 @@ class UserInfo:
         except KeyError:
             return None
 
-    async def put(self, user: User):
-        self.user_infos[str(user.id)] = user
+    async def put(self, user: User) -> bool:
+        """
+        向用户信息数据库中添加/修改一项，返回值仅代表数据是否变更，不代表操作是否成功
+        Args:
+            user: 要加入数据库的用户
+
+        Returns: 当数据库中用户信息发生变化时返回 True, 否则返回 False
+
+        """
+        try:
+            old_user: User = self.user_infos[str(user.id)]
+            attr_edited = False
+            if user.name is not None:
+                if old_user.name != user.name:
+                    attr_edited = True
+                    self.user_infos[str(user.id)].name = user.name
+            if user.nick is not None:
+                if old_user.nick != user.nick:
+                    attr_edited = True
+                    self.user_infos[str(user.id)].nick = user.nick
+            if user.avatar is not None:
+                if old_user.avatar != user.avatar:
+                    attr_edited = True
+                    self.user_infos[str(user.id)].avatar = user.avatar
+            return attr_edited
+        except KeyError:
+            self.user_infos[str(user.id)] = user
+            return True
 
     def __init__(self):
         pass