satori-python-adapter-milky 0.3.2__tar.gz → 0.4.1__tar.gz

{satori_python_adapter_milky-0.3.2 → satori_python_adapter_milky-0.4.1}/.mina/adapter_milky.toml

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

{satori_python_adapter_milky-0.3.2 → satori_python_adapter_milky-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-milky
-Version: 0.3.2
+Version: 0.4.1
 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>

{satori_python_adapter_milky-0.3.2 → satori_python_adapter_milky-0.4.1}/pyproject.toml

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

{satori_python_adapter_milky-0.3.2 → satori_python_adapter_milky-0.4.1}/src/satori/adapters/milky/events/group.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from datetime import datetime
 
 from satori import EventType
-from satori.model import Channel, ChannelType, Event, Guild, Member, User
+from satori.model import Channel, ChannelType, Event, Guild, Member, Role, User
 
 from ..utils import group_avatar, user_avatar
 from .base import register_event
@@ -15,8 +15,18 @@ async def group_member_increase(login, net, raw):
     guild_id = str(data["group_id"])
     guild = Guild(guild_id, avatar=group_avatar(guild_id))
     channel = Channel(guild_id, ChannelType.TEXT)
+    if data["user_id"] == raw["self_id"]:
+        return Event(
+            EventType.GUILD_ADDED,
+            datetime.now(),
+            login=login,
+            user=login.user,
+            member=Member(login.user, avatar=user_avatar(data["user_id"]), roles=[Role("member", "群成员")]),
+            guild=guild,
+            channel=channel,
+        )
     user = User(str(data["user_id"]), avatar=user_avatar(data["user_id"]))
-    member = Member(user, avatar=user.avatar)
+    member = Member(user, avatar=user.avatar, roles=[Role("member", "群成员")])
     operator = None
     if data.get("operator_id"):
         operator = User(str(data["operator_id"]), avatar=user_avatar(data["operator_id"]))
@@ -38,6 +48,16 @@ async def group_member_decrease(login, net, raw):
     guild_id = str(data["group_id"])
     guild = Guild(guild_id, avatar=group_avatar(guild_id))
     channel = Channel(guild_id, ChannelType.TEXT)
+    if data["user_id"] == raw["self_id"]:
+        return Event(
+            EventType.GUILD_REMOVED,
+            datetime.now(),
+            login=login,
+            user=login.user,
+            member=Member(login.user, avatar=user_avatar(data["user_id"]), roles=[Role("member", "群成员")]),
+            guild=guild,
+            channel=channel,
+        )
     user = User(str(data["user_id"]), avatar=user_avatar(data["user_id"]))
     member = Member(user, avatar=user.avatar)
     operator = None

{satori_python_adapter_milky-0.3.2 → satori_python_adapter_milky-0.4.1}/src/satori/adapters/milky/message.py

@@ -167,6 +167,9 @@ class MilkyMessageEncoder:
             case "file":
                 await self.flush()
                 await self._send_file(attrs)
+            case "milky:light_app":
+                await self.flush()
+                self.segments.append({"type": "light_app", "data": {"json_payload": attrs["json_payload"]}})
             case "author":
                 self.stack[0].author.update(attrs)
             case "quote":
@@ -364,7 +367,7 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "text":
                 result.append(E.text(data.get("text", "")))
             case "mention":
-                result.append(E.at(str(data.get("user_id"))))
+                result.append(E.at(str(data.get("user_id")), name=data.get("name")))
             case "mention_all":
                 result.append(E.at_all())
             case "face":
@@ -380,15 +383,60 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "reply":
                 seq = data.get("message_seq")
                 if seq is not None:
-                    quote = await _decode_reply(net, payload, int(seq))
+                    quote = await _decode_reply(net, payload, data, int(seq))
                     if quote:
                         result.append(quote)
+            case "forward":
+                forward_id = data.get("forward_id")
+                if forward_id is not None:
+                    messages = (await net.call_api("get_forwarded_messages", {"forward_id": forward_id}))["messages"]
+                    forward_elements = []
+                    for msg in messages:
+                        sender_name = msg.get("sender_name")
+                        avatar = msg.get("avatar_url")
+                        response = {}
+                        if "message_seq" in msg:
+                            try:
+                                response = await net.call_api(
+                                    "get_message",
+                                    {
+                                        "message_scene": payload["message_scene"],
+                                        "peer_id": payload["peer_id"],
+                                        "message_seq": msg["message_seq"],
+                                    },
+                                )
+                            except Exception:
+                                pass
+                        if response:
+                            origin = await decode_message(net, response["message"])
+                            content = []
+                            if origin.user:
+                                content.append(
+                                    E.author(
+                                        origin.user.id, origin.user.name or sender_name, origin.user.avatar or avatar
+                                    )
+                                )
+                            content.extend(origin.message)
+
+                        else:
+                            content = await _decode_segments(net, payload, msg.get("segments", []))
+                            content.insert(0, E.author(str(msg.get("sender_id")), sender_name, avatar))
+                        forward_elements.append(E.message(str(msg.get("message_seq")), content=content))
+                    result.append(E.message(forward_id, content=forward_elements, forward=True))
             case _:
                 result.append(Custom(f"milky:{seg_type}", data))
     return result
 
 
-async def _decode_reply(net: MilkyNetwork, payload: dict, message_seq: int) -> Element | None:
+async def _decode_reply(net: MilkyNetwork, payload: dict, data: dict, message_seq: int) -> Element | None:
+    if all(k in data for k in ("sender_id", "time", "segments")):
+        user = User(str(data["sender_id"]), data.get("sender_name"), avatar=user_avatar(data["sender_id"]))
+        elements = await _decode_segments(net, payload, data["segments"])
+        content = []
+        if user:
+            content.append(E.author(user.id, user.name, user.avatar))
+        content.extend(elements)
+        return E.quote(str(message_seq), content=content)
     try:
         response = await net.call_api(
             "get_message",