satori-python-adapter-onebot11 0.4.0__tar.gz → 0.4.1__tar.gz

{satori_python_adapter_onebot11-0.4.0 → satori_python_adapter_onebot11-0.4.1}/.mina/adapter_onebot11.toml

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

{satori_python_adapter_onebot11-0.4.0 → satori_python_adapter_onebot11-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-onebot11
-Version: 0.4.0
+Version: 0.4.1
 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.4.0 → satori_python_adapter_onebot11-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "satori-python-adapter-onebot11"
-version = "0.4.0"
+version = "0.4.1"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]

{satori_python_adapter_onebot11-0.4.0 → satori_python_adapter_onebot11-0.4.1}/src/satori/adapters/onebot11/message.py

@@ -226,8 +226,13 @@ class OneBot11MessageEncoder:
             case "sharp":
                 if "id" in attrs:
                     self.children.append({"type": "text", "data": {"text": attrs["id"]}})
-            case "onebot:face":
-                self.children.append({"type": "face", "data": {"id": int(attrs["id"])}})
+            case "onebot:face" | "emoji":
+                if ":" in attrs["id"]:
+                    _, emj_id_str = attrs["id"].split(":", 1)
+                    emj_id = int(emj_id_str)
+                else:
+                    emj_id = int(attrs["id"])
+                self.children.append({"type": "face", "data": {"id": emj_id}})
             case "a":
                 await self.render(_children)
                 if "href" in attrs:
@@ -317,6 +322,8 @@ async def _decode(content: list[MessageSegment], net: OneBotNetwork) -> list[Ele
                     result.append(E.at_all())
                 else:
                     result.append(E.at(str(qq), name=seg_data.get("name")))
+            case "face":
+                result.append(E.emoji(str(seg_data["id"])))
             case "image":
                 result.append(E.image(seg_data.get("url") or seg_data.get("file")))
             case "record":