satori-python-adapter-milky 0.5.0__tar.gz → 0.5.2__tar.gz

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/.mina/adapter_milky.toml

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

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-adapter-milky
-Version: 0.5.0
+Version: 0.5.2
 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>
@@ -77,6 +77,7 @@ pip install satori-python-server
 | 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, satori.adapters.milky.sse |
 | QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
+| WxClaw     | `pip install satori-python-adapter-wxclaw`   | satori.adapters.wxclaw                                                               |
 
 ### 社区适配器
 

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/README.md

@@ -55,6 +55,7 @@ pip install satori-python-server
 | 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, satori.adapters.milky.sse |
 | QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
+| WxClaw     | `pip install satori-python-adapter-wxclaw`   | satori.adapters.wxclaw                                                               |
 
 ### 社区适配器
 

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/pyproject.toml

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

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/src/satori/adapters/milky/base.py

@@ -35,6 +35,8 @@ class MilkyBaseConfig:
     """是否将 token 放在查询参数中, 默认为 False"""
     headers: dict[str, str] = field(default_factory=dict)
     """连接时使用的自定义请求头, 默认为空字典"""
+    fetch_forward_message: bool = False
+    """是否在事件中获取转发消息, 默认为 False"""
 
 
 TMilkyBaseConfig = TypeVar("TMilkyBaseConfig", bound=MilkyBaseConfig, default=MilkyBaseConfig)
@@ -58,6 +60,7 @@ class MilkyBaseAdapter(BaseAdapter[TMilkyBaseConfig], ABC):
         self.headers = config.headers.copy()
         self.session = None
         self.logins: dict[str, Login] = {}
+        self.fetch_forward_message = config.fetch_forward_message
         self.features: list[str] = list(DEFAULT_FEATURES)
         apply(self, lambda _: self, self._get_login)
 
@@ -152,7 +155,12 @@ class MilkyBaseAdapter(BaseAdapter[TMilkyBaseConfig], ABC):
             return
         user = decode_login_user(data)
         login = Login(
-            sn=0, status=LoginStatus.ONLINE, adapter="milky", platform="milky", user=user, features=self.features.copy()
+            sn=0,
+            status=LoginStatus.ONLINE,
+            adapter="milky",
+            platform="qq-client",
+            user=user,
+            features=self.features.copy(),
         )
         self_id = login.id
         previous = self.logins.get(self_id)

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/src/satori/adapters/milky/events/group.py

@@ -75,6 +75,25 @@ async def group_member_decrease(login, net, raw):
     )
 
 
+@register_event("group_disband")
+async def group_disband(login, net, raw):
+    data = raw["data"]
+    guild_id = str(data["group_id"])
+    guild = Guild(guild_id, avatar=group_avatar(guild_id))
+    channel = Channel(guild_id, ChannelType.TEXT)
+    operator = None
+    if data.get("operator_id"):
+        operator = User(str(data["operator_id"]), avatar=user_avatar(data["operator_id"]))
+    return Event(
+        EventType.GUILD_REMOVED,
+        datetime.now(),
+        login,
+        guild=guild,
+        channel=channel,
+        operator=operator,
+    )
+
+
 @register_event("group_name_change")
 async def group_name_change(login, net, raw):
     data = raw["data"]

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/src/satori/adapters/milky/message.py

@@ -139,10 +139,17 @@ class MilkyMessageEncoder:
                     return
                 if match := _BASE64_RE.match(uri):
                     uri = f"base64://{uri[len(match.group(0)) :]}"
+                sub_type = "normal"
+                if "sub_type" in attrs:
+                    sub_type = attrs["sub_type"]
+                if "subType" in attrs:
+                    sub_type = attrs["subType"]
+                if "milky:type" in attrs:
+                    sub_type = attrs["milky:type"]
                 self.segments.append(
                     {
                         "type": "image",
-                        "data": {"uri": uri, "sub_type": attrs.get("sub_type", attrs.get("subTyoe", "normal"))},
+                        "data": {"uri": uri, "sub_type": sub_type},
                     }
                 )
             case "audio":
@@ -177,6 +184,9 @@ class MilkyMessageEncoder:
                 self.segments.append(
                     {"type": "light_app", "data": {"json_payload": attrs.get("json_payload", attrs["jsonPayload"])}}
                 )
+            case "markdown" | "milky:markdown":
+                await self.flush()
+                self.segments.append({"type": "markdown", "data": {"content": str(children[0])}})
             case "author":
                 self.stack[0].author.update(attrs)
             case "quote":
@@ -255,6 +265,7 @@ class MilkyMessageEncoder:
                         "user_id": origin["message"]["sender_id"],
                         "sender_name": nickname,
                         "segments": await self.sendable(segments),
+                        "time": origin["message"]["time"],
                     }
                 )
             else:
@@ -263,6 +274,7 @@ class MilkyMessageEncoder:
                         "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,
+                        "time": int(author.get("time", datetime.now().timestamp())),
                     }
                 )
             self.segments = []
@@ -380,13 +392,13 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "face":
                 result.append(E.emoji(str(data.get("face_id"))))
             case "image":
-                result.append(E.image(_resource_url(data)))
+                result.append(E.image(await _resource_url(net, data)))
             case "record":
-                result.append(E.audio(_resource_url(data)))
+                result.append(E.audio(await _resource_url(net, data)))
             case "video":
-                result.append(E.video(_resource_url(data)))
+                result.append(E.video(await _resource_url(net, data)))
             case "file":
-                result.append(E.file(_resource_url(data)))
+                result.append(E.file(await _resource_url(net, data)))
             case "reply":
                 seq = data.get("message_seq")
                 if seq is not None:
@@ -396,6 +408,9 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
             case "forward":
                 forward_id = data.get("forward_id")
                 if forward_id is not None:
+                    if not net.fetch_forward_message:
+                        result.append(E.message(forward_id, content=[], forward=True))
+                        continue
                     try:
                         messages = (await net.call_api("get_forwarded_messages", {"forward_id": forward_id}))[
                             "messages"
@@ -441,7 +456,10 @@ async def _decode_segments(net: MilkyNetwork, payload: dict, segments: Sequence[
                         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))
+                elem = Custom(f"milky:{seg_type}", data)
+                if seg_type == "market_face" and "url" in data:
+                    elem.children.append(E.image(data["url"]))
+                result.append(elem)
     return result
 
 
@@ -476,5 +494,13 @@ async def _decode_reply(net: MilkyNetwork, payload: dict, data: dict, message_se
     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 ""
+async def _resource_url(net: MilkyNetwork, data: dict) -> str:
+    if "uri" in data:
+        return data["uri"]
+    if "url" in data:
+        return data["url"]
+    if "temp_url" in data:
+        return data["temp_url"]
+    if "resource_id" in data:
+        return (await net.call_api("get_resource_temp_url", {"resource_id": data["resource_id"]}))["url"]
+    return ""

{satori_python_adapter_milky-0.5.0 → satori_python_adapter_milky-0.5.2}/src/satori/adapters/milky/utils.py

@@ -10,6 +10,8 @@ GROUP_AVATAR_URL = "https://p.qlogo.cn/gh/{group}/{group}/640"
 
 
 class MilkyNetwork(Protocol):
+    fetch_forward_message: bool
+
     async def call_api(self, action: str, params: dict | None = None) -> dict: ...