⬆️ version 0.58.1

upgrade `milky` 0.2.0

Author: RF-Tar-Railt

pdm.lock

@@ -143,7 +143,7 @@
 from .uniseg import SupportAdapterModule as SupportAdapterModule
 from .extension import add_global_extension as add_global_extension
 
-__version__ = "0.58.0"
+__version__ = "0.58.1"
 __supported_adapters__ = set(m.value for m in SupportAdapterModule.__members__.values())  # noqa: C401
 __plugin_meta__ = PluginMetadata(
     name="Alconna 插件",

src/nonebot_plugin_alconna/__init__.py

@@ -63,7 +63,7 @@
 from .constraint import SupportAdapterModule as SupportAdapterModule
 from .adapters import alter_get_builder, alter_get_fetcher, alter_get_exporter
 
-__version__ = "0.58.0"
+__version__ = "0.58.1"
 
 __plugin_meta__ = PluginMetadata(
     name="Universal Segment 插件",

src/nonebot_plugin_alconna/uniseg/__init__.py

@@ -51,42 +51,45 @@ def face(self, seg: FaceSegment):
 
     @build("image")
     def image(self, seg: ImageSegment):
-        uri = seg.data.get("uri")
-        if isinstance(uri, str):
-            if uri.startswith("http"):
-                return Image(id=seg.data["resource_id"], url=uri)
-            if uri.startswith("file://"):
-                return Image(path=uri[7:])
-            if uri.startswith("base64://"):
-                b64 = uri[9:]
-                return Image(id=seg.data["resource_id"], raw=b64decode(b64))
-        return Image(id=seg.data["resource_id"])
+        if "resource_id" in seg.data:
+            return Image(id=seg.data["resource_id"], url=seg.data.get("temp_url"))
+        uri = seg.data["uri"]
+        if uri.startswith("http"):
+            return Image(url=uri)
+        if uri.startswith("file://"):
+            return Image(path=uri[7:])
+        if uri.startswith("base64://"):
+            b64 = uri[9:]
+            return Image(raw=b64decode(b64))
 
     @build("video")
     def video(self, seg: VideoSegment):
-        uri = seg.data.get("uri")
-        if isinstance(uri, str):
-            if uri.startswith("http"):
-                return Video(id=seg.data["resource_id"], url=uri)
-            if uri.startswith("file://"):
-                return Video(path=uri[7:])
-            if uri.startswith("base64://"):
-                b64 = uri[9:]
-                return Video(id=seg.data["resource_id"], raw=b64decode(b64))
-        return Video(id=seg.data["resource_id"])
+        if "resource_id" in seg.data:
+            return Video(id=seg.data["resource_id"], url=seg.data.get("temp_url"))
+        uri = seg.data["uri"]
+        thumbnail = None
+        if thumb_url := seg.data.get("thumb_url"):
+            thumbnail = Image(url=thumb_url)
+        if uri.startswith("http"):
+            return Video(url=uri, thumbnail=thumbnail)
+        if uri.startswith("file://"):
+            return Video(path=uri[7:], thumbnail=thumbnail)
+        if uri.startswith("base64://"):
+            b64 = uri[9:]
+            return Video(raw=b64decode(b64), thumbnail=thumbnail)
 
     @build("record")
     def record(self, seg: RecordSegment):
-        uri = seg.data.get("uri")
-        if isinstance(uri, str):
-            if uri.startswith("http"):
-                return Voice(id=seg.data["resource_id"], url=uri)
-            if uri.startswith("file://"):
-                return Voice(path=uri[7:])
-            if uri.startswith("base64://"):
-                b64 = uri[9:]
-                return Voice(id=seg.data["resource_id"], raw=b64decode(b64))
-        return Voice(id=seg.data["resource_id"])
+        if "resource_id" in seg.data:
+            return Voice(id=seg.data["resource_id"], url=seg.data.get("temp_url"), duration=seg.data["duration"])
+        uri = seg.data["uri"]
+        if uri.startswith("http"):
+            return Voice(url=uri)
+        if uri.startswith("file://"):
+            return Voice(path=uri[7:])
+        if uri.startswith("base64://"):
+            b64 = uri[9:]
+            return Voice(raw=b64decode(b64))
 
     @build("reply")
     def reply(self, seg: ReplySegment):

src/nonebot_plugin_alconna/uniseg/adapters/milky/builder.py

@@ -100,26 +100,26 @@ async def media(self, seg: Union[Image, Voice, Audio], bot: Union[Bot, None]) ->
             "voice": MessageSegment.record,
             "audio": MessageSegment.record,
         }[name]
-        if seg.id:
-            url = await bot.get_resource_temp_url(seg.id)
-            return method(url)
         if seg.raw:
             return method(raw=seg.raw)
         if seg.path:
             return method(path=Path(seg.path))
         if seg.url:
             return method(seg.url)
+        if seg.id:
+            url = await bot.get_resource_temp_url(seg.id)
+            return method(url)
         raise SerializeFailed(lang.require("nbp-uniseg", "invalid_segment").format(type=name, seg=seg))
 
     @export
     async def video(self, seg: Video, bot: Union[Bot, None]) -> "MessageSegment":
         assert isinstance(bot, MilkyBot)
         thumb_url = None
         if seg.thumbnail:
-            if seg.thumbnail.id:
-                thumb_url = await bot.get_resource_temp_url(seg.thumbnail.id)
-            elif seg.thumbnail.url:
+            if seg.thumbnail.url:
                 thumb_url = seg.thumbnail.url
+            elif seg.thumbnail.id:
+                thumb_url = await bot.get_resource_temp_url(seg.thumbnail.id)
             elif seg.__class__.to_url and seg.thumbnail.raw:
                 thumb_url = await seg.__class__.to_url(
                     seg.thumbnail.raw,
@@ -132,15 +132,15 @@ async def video(self, seg: Video, bot: Union[Bot, None]) -> "MessageSegment":
                     bot,
                     None if seg.thumbnail.name == seg.thumbnail.__default_name__ else seg.thumbnail.name,
                 )
-        if seg.id:
-            url = await bot.get_resource_temp_url(seg.id)
-            return MessageSegment.video(url, thumb_url=thumb_url)
         if seg.raw:
             return MessageSegment.video(raw=seg.raw, thumb_url=thumb_url)
         if seg.path:
             return MessageSegment.video(path=Path(seg.path), thumb_url=thumb_url)
         if seg.url:
             return MessageSegment.video(seg.url, thumb_url=thumb_url)
+        if seg.id:
+            url = await bot.get_resource_temp_url(seg.id)
+            return MessageSegment.video(url, thumb_url=thumb_url)
         raise SerializeFailed(lang.require("nbp-uniseg", "invalid_segment").format(type="video", seg=seg))
 
     @export
@@ -271,6 +271,7 @@ async def reaction(self, emoji: Emoji, mid: Any, bot: Bot, context: Union[Target
 
         if isinstance(mid, MessagePrivateResponse):
             return
+        group_id = int(context.id if isinstance(context, Target) else getattr(context.data, "group_id", -1))  # type: ignore
         if isinstance(mid, MessageGroupResponse):
             message_seq = mid.message_seq
         elif isinstance(mid, int):
@@ -282,7 +283,9 @@ async def reaction(self, emoji: Emoji, mid: Any, bot: Bot, context: Union[Target
             message_seq = int(message_seq)
         else:
             return
-        await bot.send_group_message_reaction(message_seq=message_seq, reaction=emoji.id, is_add=not delete)
+        await bot.send_group_message_reaction(
+            group_id=group_id, message_seq=message_seq, reaction=emoji.id, is_add=not delete
+        )
 
     def get_reply(self, mid: Any):
         if isinstance(mid, MessagePrivateResponse):

src/nonebot_plugin_alconna/uniseg/adapters/milky/exporter.py

@@ -855,7 +855,18 @@ def __post_init__(self):
 
 @dataclass
 class Button(Segment):
-    """Button对象，表示一类按钮消息"""
+    """Button对象，表示一类按钮消息
+
+    Args:
+        flag: 按钮类型，可能的值有 "action", "link", "input", "enter"
+        label: 按钮上的文字
+        clicked_label: 点击后按钮上的文字
+        id: 按钮的唯一标识符。当按钮类型为 "action" 时，表示按钮回调事件的 id
+        url: 当按钮类型为 "link" 时，表示链接地址
+        text: 当按钮类型为 "input" 或 "enter" 时，表示填充的文本
+        style: 按钮的样式
+        permission: 按钮的权限类型，可能的值有 "admin", "all" 或指定用户/身份组列表
+    """
 
     flag: Literal["action", "link", "input", "enter"]
     """