satori-python-adapter-onebot11 0.2.2__tar.gz → 0.2.4__tar.gz

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/.mina/adapter_onebot11.toml

@@ -3,7 +3,7 @@ raw-dependencies = ["satori-python-server >= 0.17.2"]
 
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.2.2"
+version = "0.2.4"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-onebot11
-Version: 0.2.2
+Version: 0.2.4
 Summary: Satori Protocol SDK for python, adapter for OneBot 11
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.2.2"
+version = "0.2.4"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
@@ -89,6 +89,7 @@ exclude = [
     "exam_qps.py",
     "exam1.py",
     "exam2.py",
+    "src/satori/_vendor/*",
 ]
 
 [tool.ruff.lint]

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/src/satori/adapters/onebot11/api.py

@@ -27,31 +27,6 @@ from satori.server.route import (
 from .message import OneBot11MessageEncoder, decode
 from .utils import GROUP_AVATAR_URL, USER_AVATAR_URL, OneBotNetwork
 
-INTERNAL_API = [
-    "get_forward_msg",
-    "send_like",
-    "set_group_card",
-    "set_group_leave",
-    "set_group_special_title",
-    "get_login_info",
-    "get_group_honor_info",
-    "get_cookies",
-    "get_csrf_token",
-    "get_credentials",
-    "get_record",
-    "get_image",
-    "can_send_image",
-    "can_send_record",
-    "get_status",
-    "get_version_info",
-    "set_restart",
-    "clean_cache",
-    # additional
-    "group_poke",
-    "friend_poke",
-    "set_group_reaction",
-]
-
 
 def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_getter: Callable[[str], Login]):
     @adapter.route(Api.LOGIN_GET)
@@ -335,9 +310,7 @@ def apply(adapter: Adapter, net_getter: Callable[[str], OneBotNetwork], login_ge
         )
         return
 
-    for api in INTERNAL_API:
-
-        @adapter.route(api)
-        async def internal_api(request: Request[dict]):
-            net = net_getter(request.self_id)
-            return await net.call_api(api, request.params)
+    @adapter.route("*")
+    async def internal_api(request: Request[dict]):
+        net = net_getter(request.self_id)
+        return await net.call_api(request.action.removeprefix("internal/"), request.params)

satori_python_adapter_onebot11-0.2.4/src/satori/adapters/onebot11/events/__init__.py

@@ -0,0 +1,3 @@
+from . import message as message  # noqa: F401
+from . import notice as notice  # noqa: F401
+from . import request as request  # noqa: F401

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/src/satori/adapters/onebot11/forward.py

@@ -217,7 +217,7 @@ class OneBot11ForwardAdapter(BaseAdapter):
         async with self.session.get(path) as resp:
             return Response(await resp.read())
 
-    async def call_api(self, action: str, params: dict | None = None) -> dict | None:
+    async def call_api(self, action: str, params: dict | None = None) -> dict:
         if not self.connection:
             raise RuntimeError("connection is not established")
 
@@ -234,7 +234,7 @@ class OneBot11ForwardAdapter(BaseAdapter):
         if result["status"] != "ok":
             raise ActionFailed(f"{result['retcode']}: {result}", result)
 
-        return result.get("data")
+        return result.get("data", {})
 
     def __str__(self):
         return self.id

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/src/satori/adapters/onebot11/message.py

@@ -279,7 +279,7 @@ class OneBot11MessageEncoder:
             await self.flush()
             self.children.append({"type": "xml", "data": attrs})
         elif type_ == "author":
-            self.stack[0].author = attrs.copy()
+            self.stack[0].author.update(attrs)
         elif type_ == "quote":
             await self.flush()
             self.children.append({"type": "reply", "data": attrs})
@@ -294,9 +294,20 @@ class OneBot11MessageEncoder:
             elif "id" in attrs:
                 self.stack[0].author["message_id"] = str(attrs["id"])
             else:
-                self.stack[0].author = {
-                    k: v for k, v in attrs.items() if k in ("user_id", "username", "nickname", "time")
-                }
+                payload = {}
+                if "name" in attrs:
+                    payload["name"] = attrs["name"]
+                if "nickname" in attrs:
+                    payload["name"] = attrs["nickname"]
+                if "username" in attrs:
+                    payload["name"] = attrs["username"]
+                if "id" in attrs:
+                    payload["id"] = int(attrs["id"])
+                if "user_id" in attrs:
+                    payload["id"] = int(attrs["user_id"])
+                if "time" in attrs:
+                    payload["time"] = int(attrs["time"])
+                self.stack[0].author.update(payload)
                 await self.render(_children)
                 await self.flush()
         else:

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/src/satori/adapters/onebot11/reverse.py

@@ -104,7 +104,7 @@ class _Connection:
 
             asyncio.create_task(event_parse_task(data))
 
-    async def call_api(self, action: str, params: dict | None = None) -> dict | None:
+    async def call_api(self, action: str, params: dict | None = None) -> dict:
         if not self.ws:
             raise RuntimeError("connection is not established")
 
@@ -121,7 +121,7 @@ class _Connection:
         if result["status"] != "ok":
             raise ActionFailed(f"{result['retcode']}: {result}", result)
 
-        return result.get("data")
+        return result.get("data", {})
 
 
 class OneBot11ReverseAdapter(BaseAdapter):

{satori_python_adapter_onebot11-0.2.2 → satori_python_adapter_onebot11-0.2.4}/src/satori/adapters/onebot11/utils.py

@@ -2,7 +2,7 @@ from typing import Protocol
 
 
 class OneBotNetwork(Protocol):
-    async def call_api(self, action: str, params: dict | None = None) -> dict | None: ...
+    async def call_api(self, action: str, params: dict | None = None) -> dict: ...
 
 
 SPECIAL_POST_TYPE = {"message_sent": "message"}

satori_python_adapter_onebot11-0.2.2/src/satori/adapters/onebot11/events/__init__.py

@@ -1,4 +0,0 @@
-from . import message  # noqa: F401
-from . import notice  # noqa: F401
-from . import request # noqa: F401
-