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

{satori_python_adapter_milky-0.1.2 → 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.6"]
+raw-dependencies = ["satori-python-server >= 0.18.0"]
 
 [project]
 name = "satori-python-adapter-milky"
-version = "0.1.2"
+version = "0.2.0"
 authors = [
   {name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com"}
 ]

{satori_python_adapter_milky-0.1.2 → 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.2
+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.6
+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.2 → 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.2 → satori_python_adapter_milky-0.2.0}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "satori-python-adapter-milky"
-version = "0.1.2"
+version = "0.2.0"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "satori-python-server >= 0.17.6",
+    "satori-python-server >= 0.18.0",
 ]
 description = "Satori Protocol SDK for python, adapter for Milky"
 readme = "README.md"

{satori_python_adapter_milky-0.1.2 → satori_python_adapter_milky-0.2.0}/src/satori/adapters/milky/main.py

@@ -196,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.1.2 → satori_python_adapter_milky-0.2.0}/src/satori/adapters/milky/message.py

@@ -91,108 +91,111 @@ class MilkyMessageEncoder:
         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
-        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"
-        elif type_ == "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"}})
-        elif type_ == "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)}})
-        elif type_ == "sharp":
-            self.segments.append({"type": "text", "data": {"text": attrs["id"]}})
-        elif type_ == "a":
-            await self.render(children)
-            if "href" in attrs:
+        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": f" ({attrs['href']})"}})
+                    self.segments.append({"type": "text", "data": {"text": text}})
                 else:
-                    self.segments[-1]["data"]["text"] += f" ({attrs['href']})"
-        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")}})
-        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}})
-        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})
-        elif type_ == "milky:face":
-            self.segments.append({"type": "face", "data": {"face_id": attrs["id"]}})
-        elif type_ == "file":
-            await self.flush()
-            await self._send_file(attrs)
-        elif type_ == "author":
-            self.stack[0].author.update(attrs)
-        elif type_ == "quote":
-            await self.flush()
-            self.segments.append({"type": "reply", "data": {"message_seq": int(attrs["id"])}})
-        elif type_ == "message":
-            await self.flush()
-            if "forward" in attrs:
-                self.stack.insert(0, State("forward"))
+                    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)
-                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)
+                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()
-        else:
-            await self.render(children)
+                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:
@@ -352,28 +355,29 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
     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))
+        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
 
 

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

@@ -147,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):