satori-python-adapter-milky 0.1.0__tar.gz → 0.2.0__tar.gz

{satori_python_adapter_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/.mina/adapter_milky.toml

@@ -1,9 +1,9 @@
 includes = ["src/satori/adapters/milky"]
-raw-dependencies = ["satori-python-server >= 0.17.2"]
+raw-dependencies = ["satori-python-server >= 0.18.0"]
 
 [project]
 name = "satori-python-adapter-milky"
-version = "0.1.0"
+version = "0.2.0"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-milky
-Version: 0.1.0
+Version: 0.2.0
 Summary: Satori Protocol SDK for python, adapter for Milky
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -17,7 +17,7 @@ Classifier: Operating System :: OS Independent
 Project-URL: Homepage, https://github.com/RF-Tar-Railt/satori-python
 Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
 Requires-Python: <4.0,>=3.10
-Requires-Dist: satori-python-server>=0.17.2
+Requires-Dist: satori-python-server>=0.18.0
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -27,17 +27,18 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -75,6 +76,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_adapter_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/README.md

@@ -5,17 +5,18 @@
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -53,6 +54,7 @@ pip install satori-python-server
 | OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
 | Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
 | Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_adapter_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-milky"
-version = "0.1.0"
+version = "0.2.0"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python-server >= 0.17.2",
+    "satori-python-server >= 0.18.0",
 ]
 description = "Satori Protocol SDK for python, adapter for Milky"
 readme = "README.md"
@@ -46,7 +46,7 @@ dev = [
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",
     "nonechat<0.7.0,>=0.6.0",
-    "uvicorn[standard]>=0.35.0",
+    "uvicorn[standard]>=0.37.0",
 ]
 
 [tool.pdm.build]
@@ -89,6 +89,7 @@ exclude = [
     "exam_qps.py",
     "exam1.py",
     "exam2.py",
+    "src/satori/_vendor/*",
 ]
 
 [tool.ruff.lint]

{satori_python_adapter_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/src/satori/adapters/milky/api.py

@@ -214,7 +214,7 @@ def apply(
             {
                 "group_id": int(request.params["guild_id"]),
                 "user_id": int(request.params["user_id"]),
-                "duration": int(request.params["duration"]),
+                "duration": int(request.params["duration"] / 1000),
             },
         )
         return
@@ -309,3 +309,8 @@ def apply(
             payload["reason"] = request.params.get("comment")
             await net.call_api("reject_friend_request", payload)
         return
+
+    @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_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/src/satori/adapters/milky/main.py

@@ -15,7 +15,7 @@ from satori.exception import ActionFailed
 from satori.model import Event, Login, LoginStatus
 from satori.server.adapter import Adapter as BaseAdapter
 from satori.server.model import Request
-from satori.utils import decode
+from satori.utils import decode, encode
 
 from .api import apply
 from .events import event_handlers
@@ -116,17 +116,18 @@ class MilkyAdapter(BaseAdapter):
             content = await resp.read()
             return Response(content=content, media_type=resp.headers.get("Content-Type"))
 
-    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.session:
             raise RuntimeError("HTTP session not initialized")
         url = self.api_base.with_path(f"{self.api_base.path.rstrip('/')}/{action}")
         headers = self.headers.copy()
+        headers["Content-Type"] = "application/json"
         if self.token:
             headers.setdefault("Authorization", f"Bearer {self.token}")
-        async with self.session.post(url, json=params or {}, headers=headers) as resp:
+        async with self.session.post(url, data=encode(params or {}), headers=headers) as resp:
             resp.raise_for_status()
-            data = await resp.json()
-        if data.get("status") == "failed":
+            data = decode(await resp.text())
+        if data.get("status") == "failed" or data.get("retcode", 0) != 0:
             raise ActionFailed(f"{data.get('retcode')}: {data.get('message')}", data)
         return data.get("data")
 
@@ -195,15 +196,14 @@ class MilkyAdapter(BaseAdapter):
         if handler:
             event = await handler(login, network, payload)
         else:
-            body = payload.get("data", {})
             event = Event(
                 EventType.INTERNAL,
                 datetime.fromtimestamp(payload.get("time", datetime.now().timestamp())),
                 login,
-                _type=event_type,
-                _data=body,
             )
         if event:
+            event._type = event_type
+            event._data = payload.get("data", {})
             await self.server.post(event)
 
     async def refresh_login(self):

satori_python_adapter_milky-0.2.0/src/satori/adapters/milky/message.py

@@ -0,0 +1,407 @@
+from __future__ import annotations
+
+import re
+from collections.abc import Sequence
+from dataclasses import dataclass, field
+from datetime import datetime
+from typing import Any, Literal
+
+from satori.element import Custom, E, Element
+from satori.model import Channel, ChannelType, Login, MessageObject, User
+from satori.parser import Element as RawElement
+from satori.parser import parse
+
+from .utils import MilkyNetwork, decode_guild, decode_guild_channel_id, decode_member, get_scene_and_peer, user_avatar
+
+_BASE64_RE = re.compile(r"^data:([\w/.+-]+);base64,")
+
+
+@dataclass
+class State:
+    type: Literal["message", "reply", "forward"]
+    children: list[dict[str, Any]] = field(default_factory=list)
+    author: dict[str, Any] = field(default_factory=dict)
+
+
+class MilkyMessageEncoder:
+    def __init__(self, login: Login, net: MilkyNetwork, channel_id: str):
+        self.login = login
+        self.net = net
+        self.channel_id = channel_id
+        self.segments: list[dict[str, Any]] = []
+        self.stack = [State("message")]
+        self.results: list[MessageObject] = []
+
+    async def send_forward(self):
+        if not self.stack[0].children:
+            return
+        scene, peer_id = get_scene_and_peer(self.channel_id)
+        seg = {"type": "forward", "data": {"messages": self.stack[0].children}}
+        if scene == "group":
+            resp = await self.net.call_api("send_group_message", {"group_id": peer_id, "message": [seg]})
+        else:
+            resp = await self.net.call_api("send_private_message", {"user_id": peer_id, "message": [seg]})
+        if resp:
+            channel_type = ChannelType.TEXT if scene == "group" else ChannelType.DIRECT
+            channel_id = str(peer_id) if scene == "group" else self.channel_id
+            channel = Channel(channel_id, channel_type)
+            created_at = datetime.fromtimestamp(resp.get("time", datetime.now().timestamp()))
+            message = MessageObject(str(resp.get("message_seq", "")), "", channel=channel, created_at=created_at)
+            self.results.append(message)
+
+    async def _send_file(self, attrs: dict[str, Any]):
+        uri = attrs.get("src") or attrs.get("url")
+        if not uri:
+            return
+        name = attrs.get("title") or uri.split("/")[-1]
+        if match := _BASE64_RE.match(uri):
+            uri = f"base64://{uri[len(match.group(0)) :]}"
+        scene, peer_id = get_scene_and_peer(self.channel_id)
+        if scene == "group":
+            await self.net.call_api(
+                "upload_group_file",
+                {
+                    "group_id": peer_id,
+                    "file_uri": uri,
+                    "file_name": name,
+                },
+            )
+        else:
+            await self.net.call_api(
+                "upload_private_file",
+                {
+                    "user_id": peer_id,
+                    "file_uri": uri,
+                    "file_name": name,
+                },
+            )
+        self.results.append(MessageObject("", ""))
+
+    async def send(self, content: str) -> list[MessageObject]:
+        raw_elements = parse(content)
+        await self.render(raw_elements)
+        await self.flush()
+        return self.results
+
+    async def render(self, elements: Sequence[RawElement]):
+        for element in elements:
+            await self.visit(element)
+
+    async def visit(self, element: RawElement):
+        type_ = element.type
+        attrs = element.attrs
+        children = element.children
+        match type_:
+            case "text":
+                text = attrs.get("text", "")
+                if not self.segments or self.segments[-1]["type"] != "text":
+                    self.segments.append({"type": "text", "data": {"text": text}})
+                else:
+                    self.segments[-1]["data"]["text"] += text
+            case "br":
+                if not self.segments or self.segments[-1]["type"] != "text":
+                    self.segments.append({"type": "text", "data": {"text": "\n"}})
+                else:
+                    self.segments[-1]["data"]["text"] += "\n"
+            case "p":
+                prev = self.segments[-1] if self.segments else None
+                if prev and prev["type"] == "text":
+                    if not prev["data"]["text"].endswith("\n"):
+                        prev["data"]["text"] += "\n"
+                else:
+                    self.segments.append({"type": "text", "data": {"text": "\n"}})
+                await self.render(children)
+                if self.segments and self.segments[-1]["type"] == "text":
+                    if not self.segments[-1]["data"]["text"].endswith("\n"):
+                        self.segments[-1]["data"]["text"] += "\n"
+                else:
+                    self.segments.append({"type": "text", "data": {"text": "\n"}})
+            case "at":
+                if attrs.get("type") == "all":
+                    self.segments.append({"type": "mention_all", "data": {}})
+                elif "id" in attrs:
+                    target = attrs["id"]
+                    self.segments.append({"type": "mention", "data": {"user_id": int(target)}})
+            case "sharp":
+                self.segments.append({"type": "text", "data": {"text": attrs["id"]}})
+            case "a":
+                await self.render(children)
+                if "href" in attrs:
+                    if not self.segments or self.segments[-1]["type"] != "text":
+                        self.segments.append({"type": "text", "data": {"text": f" ({attrs['href']})"}})
+                    else:
+                        self.segments[-1]["data"]["text"] += f" ({attrs['href']})"
+            case "img" | "image":
+                uri = attrs.get("src") or attrs.get("url")
+                if not uri:
+                    return
+                if match := _BASE64_RE.match(uri):
+                    uri = f"base64://{uri[len(match.group(0)) :]}"
+                self.segments.append(
+                    {"type": "image", "data": {"uri": uri, "sub_type": attrs.get("sub_type", "normal")}}
+                )
+            case "audio":
+                uri = attrs.get("src") or attrs.get("url")
+                if not uri:
+                    return
+                if match := _BASE64_RE.match(uri):
+                    uri = f"base64://{uri[len(match.group(0)) :]}"
+                self.segments.append({"type": "record", "data": {"uri": uri}})
+            case "video":
+                uri = attrs.get("src") or attrs.get("url")
+                if not uri:
+                    return
+                if match := _BASE64_RE.match(uri):
+                    uri = f"base64://{uri[len(match.group(0)) :]}"
+                payload = {"uri": uri}
+                if poster := attrs.get("poster"):
+                    payload["thumb_uri"] = poster
+                self.segments.append({"type": "video", "data": payload})
+            case "milky:face":
+                self.segments.append({"type": "face", "data": {"face_id": attrs["id"]}})
+            case "file":
+                await self.flush()
+                await self._send_file(attrs)
+            case "author":
+                self.stack[0].author.update(attrs)
+            case "quote":
+                await self.flush()
+                self.segments.append({"type": "reply", "data": {"message_seq": int(attrs["id"])}})
+            case "message":
+                await self.flush()
+                if "forward" in attrs:
+                    self.stack.insert(0, State("forward"))
+                    await self.render(children)
+                    await self.flush()
+                    self.stack.pop(0)
+                    await self.send_forward()
+                elif "id" in attrs:
+                    self.stack[0].author["seq"] = int(attrs["id"])
+                else:
+                    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()
+            case _:
+                await self.render(children)
+
+    async def flush(self):
+        if not self.segments:
+            return
+
+        while True:
+            first = self.segments[0]
+            if first["type"] != "text":
+                break
+            first["data"]["text"] = first["data"]["text"].lstrip()
+            if first["data"]["text"]:
+                break
+            self.segments.pop(0)
+
+        while True:
+            last = self.segments[-1]
+            if last["type"] != "text":
+                break
+            last["data"]["text"] = last["data"]["text"].rstrip()
+            if last["data"]["text"]:
+                break
+            self.segments.pop()
+
+        scene, peer_id = get_scene_and_peer(self.channel_id)
+        slot = self.stack[0]
+        type_, author = slot.type, slot.author
+        if not self.segments and "seq" not in author:
+            return
+        if type_ == "forward":
+            if "seq" in author:
+                origin = await self.net.call_api(
+                    "get_message", {"message_scene": scene, "peer_id": peer_id, "message_seq": author["seq"]}
+                )
+                segments = origin["message"]["segments"]
+                nickname = (
+                    origin["message"]["friend"]["nickname"]
+                    if scene == "friend"
+                    else origin["message"]["group_member"]["nickname"]
+                )
+                self.stack[1].children.append(
+                    {
+                        "user_id": origin["message"]["sender_id"],
+                        "sender_name": nickname,
+                        "segments": await self.sendable(segments),
+                    }
+                )
+            else:
+                self.stack[1].children.append(
+                    {
+                        "user_id": int(author.get("id", self.login.id)),
+                        "sender_name": author.get("name", self.login.user.name or self.login.id),
+                        "segments": self.segments,
+                    }
+                )
+            self.segments = []
+            return
+
+        if scene == "group":
+            resp = await self.net.call_api("send_group_message", {"group_id": peer_id, "message": self.segments})
+        else:
+            resp = await self.net.call_api("send_private_message", {"user_id": peer_id, "message": self.segments})
+        if resp:
+            channel_type = ChannelType.TEXT if scene == "group" else ChannelType.DIRECT
+            channel_id = str(peer_id) if scene == "group" else self.channel_id
+            channel = Channel(channel_id, channel_type)
+            created_at = datetime.fromtimestamp(resp.get("time", datetime.now().timestamp()))
+            message = MessageObject(str(resp.get("message_seq", "")), "", channel=channel, created_at=created_at)
+            self.results.append(message)
+        self.segments = []
+
+    async def sendable(self, segments: list[dict[str, Any]]) -> list[dict[str, Any]]:
+        new = []
+        for seg in segments:
+            if (
+                seg["type"] in ("image", "record", "video")
+                and "resource_id" in seg["data"]
+                and "uri" not in seg["data"]
+            ):
+                data = seg["data"]
+                if "temp_url" not in data:
+                    data["uri"] = (
+                        await self.net.call_api("get_resource_temp_url", {"resource_id": data["resource_id"]})
+                    )["url"]
+                else:
+                    data["uri"] = data["temp_url"]
+                new.append({"type": seg["type"], "data": data})
+            elif seg["type"] == "forward" and "forward_id" in seg["data"]:
+                forward_id = seg["data"]["forward_id"]
+                messages = (await self.net.call_api("get_forwarded_messages", {"forward_id": forward_id}))["messages"]
+                new.append(
+                    {
+                        "type": "forward",
+                        "data": {
+                            "messages": [
+                                {
+                                    "user_id": int(self.login.id),
+                                    "sender_name": msg["sender_name"],
+                                    "segments": await self.sendable(msg["segments"]),
+                                }
+                                for msg in messages
+                            ]
+                        },
+                    }
+                )
+            elif seg["type"] in ("market_face", "light_app", "xml"):
+                continue
+        return new
+
+
+async def decode_message(net: MilkyNetwork, payload: dict) -> MessageObject:
+    elements = await _decode_segments(net, payload, payload.get("segments") or [])
+    guild_id, channel_id = decode_guild_channel_id(payload)
+    channel_type = ChannelType.TEXT if guild_id else ChannelType.DIRECT
+    channel_name = None
+    guild = None
+    member = None
+    if payload["message_scene"] == "group":
+        group_info = payload.get("group")
+        if group_info:
+            guild = decode_guild(group_info)
+            channel_name = group_info.get("group_name")
+        member_info = payload.get("group_member")
+        if member_info:
+            member = decode_member(member_info)
+    elif payload["message_scene"] == "friend":
+        friend_info = payload.get("friend")
+        if friend_info:
+            channel_name = friend_info.get("nickname")
+    channel = Channel(channel_id, channel_type, channel_name)
+
+    user_name = None
+    if payload["message_scene"] == "group":
+        member_info = payload.get("group_member")
+        if member_info:
+            user_name = member_info.get("nickname")
+    elif payload["message_scene"] == "friend":
+        friend_info = payload.get("friend")
+        if friend_info:
+            user_name = friend_info.get("nickname")
+    user = User(str(payload["sender_id"]), user_name, avatar=user_avatar(payload["sender_id"]))
+
+    message = MessageObject(
+        str(payload["message_seq"]),
+        "".join(str(elem) for elem in elements),
+        channel=channel,
+        guild=guild,
+        member=member,
+        user=user,
+        created_at=datetime.fromtimestamp(payload["time"]),
+    )
+    message.message = elements
+    return message
+
+
+async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[dict]) -> list[Element]:
+    result: list[Element] = []
+    for segment in segments:
+        seg_type = segment.get("type")
+        data = segment.get("data", {})
+        match seg_type:
+            case "text":
+                result.append(E.text(data.get("text", "")))
+            case "mention":
+                result.append(E.at(str(data.get("user_id"))))
+            case "mention_all":
+                result.append(E.at_all())
+            case "image":
+                result.append(E.image(_resource_url(data)))
+            case "record":
+                result.append(E.audio(_resource_url(data)))
+            case "video":
+                result.append(E.video(_resource_url(data)))
+            case "file":
+                result.append(E.file(_resource_url(data)))
+            case "reply":
+                seq = data.get("message_seq")
+                if seq is not None:
+                    quote = await _decode_reply(net, payload, int(seq))
+                    if quote:
+                        result.append(quote)
+            case _:
+                result.append(Custom(f"milky:{seg_type}", data))
+    return result
+
+
+async def _decode_reply(net: MilkyNetwork, payload: dict, message_seq: int) -> Element | None:
+    try:
+        response = await net.call_api(
+            "get_message",
+            {
+                "message_scene": payload["message_scene"],
+                "peer_id": payload["peer_id"],
+                "message_seq": message_seq,
+            },
+        )
+    except Exception:
+        return None
+    if not response or "message" not in response:
+        return None
+    quoted = await decode_message(net, response["message"])
+    content = []
+    if quoted.user:
+        content.append(E.author(quoted.user.id, quoted.user.name, quoted.user.avatar))
+    content.extend(quoted.message)
+    return E.quote(str(message_seq), content=content)
+
+
+def _resource_url(data: dict) -> str:
+    return data.get("temp_url") or data.get("url") or data.get("uri") or ""

{satori_python_adapter_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/src/satori/adapters/milky/utils.py

@@ -10,7 +10,7 @@ GROUP_AVATAR_URL = "https://p.qlogo.cn/gh/{group}/{group}/640"
 
 
 class MilkyNetwork(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: ...
 
 
 def user_avatar(uin: int | str) -> str:

{satori_python_adapter_milky-0.1.0 → satori_python_adapter_milky-0.2.0}/src/satori/adapters/milky/webhook.py

@@ -16,6 +16,7 @@ from satori.exception import ActionFailed
 from satori.model import Event, Login, LoginStatus
 from satori.server.adapter import Adapter as BaseAdapter
 from satori.server.model import Request
+from satori.utils import decode, encode
 
 from .api import apply
 from .events import event_handlers
@@ -109,17 +110,18 @@ class MilkyWebhookAdapter(BaseAdapter):
             content = await resp.read()
             return Response(content=content, media_type=resp.headers.get("Content-Type"))
 
-    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.session:
             raise RuntimeError("HTTP session not initialized")
         url = self.api_base.with_path(f"{self.api_base.path.rstrip('/')}/{action}")
         headers = self.headers.copy()
+        headers["Content-Type"] = "application/json"
         if self.token:
             headers.setdefault("Authorization", f"Bearer {self.token}")
-        async with self.session.post(url, json=params or {}, headers=headers) as resp:
+        async with self.session.post(url, data=encode(params or {}), headers=headers) as resp:
             resp.raise_for_status()
-            data = await resp.json()
-        if data.get("status") == "failed":
+            data = decode(await resp.text())
+        if data.get("status") == "failed" or data.get("retcode", 0) != 0:
             raise ActionFailed(f"{data.get('retcode')}: {data.get('message')}", data)
         return data.get("data")
 
@@ -145,15 +147,14 @@ class MilkyWebhookAdapter(BaseAdapter):
         if handler:
             event = await handler(login, network, payload)
         else:
-            body = payload.get("data", {})
             event = Event(
                 EventType.INTERNAL,
                 datetime.fromtimestamp(payload.get("time", datetime.now().timestamp())),
                 login,
-                _type=event_type,
-                _data=body,
             )
         if event:
+            event._type = event_type
+            event._data = payload.get("data", {})
             await self.server.post(event)
 
     async def refresh_login(self):

satori_python_adapter_milky-0.1.0/src/satori/adapters/milky/message.py

@@ -1,233 +0,0 @@
-from __future__ import annotations
-
-import re
-from collections.abc import Sequence
-from datetime import datetime
-from typing import Any
-
-from satori.element import Custom, E, Element
-from satori.model import Channel, ChannelType, Login, MessageObject, User
-from satori.parser import Element as RawElement
-from satori.parser import parse
-
-from .utils import MilkyNetwork, decode_guild, decode_guild_channel_id, decode_member, get_scene_and_peer, user_avatar
-
-_BASE64_RE = re.compile(r"^data:([\w/.+-]+);base64,")
-
-
-class MilkyMessageEncoder:
-    def __init__(self, login: Login, net: MilkyNetwork, channel_id: str):
-        self.login = login
-        self.net = net
-        self.channel_id = channel_id
-        self.segments: list[dict[str, Any]] = []
-        self.elements: list[Element] = []
-        self.results: list[MessageObject] = []
-
-    async def send(self, content: str) -> list[MessageObject]:
-        raw_elements = parse(content)
-        await self.render(raw_elements)
-        await self.flush()
-        return self.results
-
-    async def render(self, elements: Sequence[RawElement]):
-        for element in elements:
-            await self.visit(element)
-
-    async def visit(self, element: RawElement):
-        type_ = element.type
-        attrs = element.attrs
-        children = element.children
-        if type_ == "text":
-            text = attrs.get("text", "")
-            if not self.segments or self.segments[-1]["type"] != "text":
-                self.segments.append({"type": "text", "data": {"text": text}})
-            else:
-                self.segments[-1]["data"]["text"] += text
-            self.elements.append(E.text(text))
-        elif type_ == "br":
-            if not self.segments or self.segments[-1]["type"] != "text":
-                self.segments.append({"type": "text", "data": {"text": "\n"}})
-            else:
-                self.segments[-1]["data"]["text"] += "\n"
-            self.elements.append(E.text("\n"))
-        elif type_ == "p":
-            await self.render(children)
-            if self.segments:
-                if self.segments[-1]["type"] == "text":
-                    self.segments[-1]["data"]["text"] += "\n"
-                else:
-                    self.segments.append({"type": "text", "data": {"text": "\n"}})
-            self.elements.append(E.text("\n"))
-        elif type_ == "at":
-            if attrs.get("type") == "all":
-                self.segments.append({"type": "mention_all", "data": {}})
-                self.elements.append(E.at_all())
-            elif "id" in attrs:
-                target = attrs["id"]
-                self.segments.append({"type": "mention", "data": {"user_id": int(target)}})
-                self.elements.append(E.at(str(target)))
-        elif type_ == "quote":
-            quote_id = attrs.get("id")
-            if quote_id is not None:
-                try:
-                    seq = int(quote_id)
-                except ValueError:
-                    seq = None
-                if seq is not None:
-                    self.segments.append({"type": "reply", "data": {"message_seq": seq}})
-                    self.elements.append(E.quote(str(seq), content=[E.text("")]))
-            await self.render(children)
-        elif type_ in {"img", "image"}:
-            uri = attrs.get("src") or attrs.get("url")
-            if not uri:
-                return
-            if match := _BASE64_RE.match(uri):
-                uri = f"base64://{uri[len(match.group(0)) :]}"
-            self.segments.append({"type": "image", "data": {"uri": uri, "sub_type": attrs.get("sub_type", "normal")}})
-            self.elements.append(E.image(uri))
-        elif type_ == "audio":
-            uri = attrs.get("src") or attrs.get("url")
-            if not uri:
-                return
-            if match := _BASE64_RE.match(uri):
-                uri = f"base64://{uri[len(match.group(0)) :]}"
-            self.segments.append({"type": "record", "data": {"uri": uri}})
-            self.elements.append(E.audio(uri))
-        elif type_ == "video":
-            uri = attrs.get("src") or attrs.get("url")
-            if not uri:
-                return
-            if match := _BASE64_RE.match(uri):
-                uri = f"base64://{uri[len(match.group(0)) :]}"
-            payload = {"uri": uri}
-            if poster := attrs.get("poster"):
-                payload["thumb_uri"] = poster
-            self.segments.append({"type": "video", "data": payload})
-            self.elements.append(E.video(uri))
-        else:
-            await self.render(children)
-
-    async def flush(self):
-        if not self.segments:
-            return
-        scene, peer_id = get_scene_and_peer(self.channel_id)
-        payload: dict = {"message": self.segments}
-        if scene == "group":
-            payload["group_id"] = peer_id
-            resp = await self.net.call_api("send_group_message", payload)
-        else:
-            payload["user_id"] = peer_id
-            resp = await self.net.call_api("send_private_message", payload)
-        if resp:
-            channel_type = ChannelType.TEXT if scene == "group" else ChannelType.DIRECT
-            channel_id = str(peer_id) if scene == "group" else self.channel_id
-            channel = Channel(channel_id, channel_type)
-            created_at = datetime.fromtimestamp(resp.get("time", datetime.now().timestamp()))
-            content = "".join(str(elem) for elem in self.elements)
-            message = MessageObject(str(resp.get("message_seq", "")), content, channel=channel, created_at=created_at)
-            message.message = list(self.elements)
-            self.results.append(message)
-        self.segments = []
-        self.elements = []
-
-
-async def decode_message(net: MilkyNetwork, payload: dict) -> MessageObject:
-    elements = await _decode_segments(net, payload, payload.get("segments") or [])
-    guild_id, channel_id = decode_guild_channel_id(payload)
-    channel_type = ChannelType.TEXT if guild_id else ChannelType.DIRECT
-    channel_name = None
-    guild = None
-    member = None
-    if payload["message_scene"] == "group":
-        group_info = payload.get("group")
-        if group_info:
-            guild = decode_guild(group_info)
-            channel_name = group_info.get("group_name")
-        member_info = payload.get("group_member")
-        if member_info:
-            member = decode_member(member_info)
-    elif payload["message_scene"] == "friend":
-        friend_info = payload.get("friend")
-        if friend_info:
-            channel_name = friend_info.get("nickname")
-    channel = Channel(channel_id, channel_type, channel_name)
-
-    user_name = None
-    if payload["message_scene"] == "group":
-        member_info = payload.get("group_member")
-        if member_info:
-            user_name = member_info.get("nickname")
-    elif payload["message_scene"] == "friend":
-        friend_info = payload.get("friend")
-        if friend_info:
-            user_name = friend_info.get("nickname")
-    user = User(str(payload["sender_id"]), user_name, avatar=user_avatar(payload["sender_id"]))
-
-    message = MessageObject(
-        str(payload["message_seq"]),
-        "".join(str(elem) for elem in elements),
-        channel=channel,
-        guild=guild,
-        member=member,
-        user=user,
-        created_at=datetime.fromtimestamp(payload["time"]),
-    )
-    message.message = elements
-    return message
-
-
-async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[dict]) -> list[Element]:
-    result: list[Element] = []
-    for segment in segments:
-        seg_type = segment.get("type")
-        data = segment.get("data", {})
-        if seg_type == "text":
-            result.append(E.text(data.get("text", "")))
-        elif seg_type == "mention":
-            result.append(E.at(str(data.get("user_id"))))
-        elif seg_type == "mention_all":
-            result.append(E.at_all())
-        elif seg_type == "image":
-            result.append(E.image(_resource_url(data)))
-        elif seg_type == "record":
-            result.append(E.audio(_resource_url(data)))
-        elif seg_type == "video":
-            result.append(E.video(_resource_url(data)))
-        elif seg_type == "file":
-            result.append(E.file(_resource_url(data)))
-        elif seg_type == "reply":
-            seq = data.get("message_seq")
-            if seq is not None:
-                quote = await _decode_reply(net, payload, int(seq))
-                if quote:
-                    result.append(quote)
-        else:
-            result.append(Custom(f"milky:{seg_type}", data))
-    return result
-
-
-async def _decode_reply(net: MilkyNetwork, payload: dict, message_seq: int) -> Element | None:
-    try:
-        response = await net.call_api(
-            "get_message",
-            {
-                "message_scene": payload["message_scene"],
-                "peer_id": payload["peer_id"],
-                "message_seq": message_seq,
-            },
-        )
-    except Exception:
-        return None
-    if not response or "message" not in response:
-        return None
-    quoted = await decode_message(net, response["message"])
-    content = []
-    if quoted.user:
-        content.append(E.author(quoted.user.id, quoted.user.name, quoted.user.avatar))
-    content.extend(quoted.message)
-    return E.quote(str(message_seq), content=content)
-
-
-def _resource_url(data: dict) -> str:
-    return data.get("temp_url") or data.get("url") or data.get("uri") or ""