🐛 fix adapter minecraft broken changes

Author: RF-Tar-Railt

pdm.lock

@@ -223,10 +223,10 @@ test = [
     "fastapi>=0.119.0",
     "uvicorn[standard]>=0.37.0",
     "nonebot2[httpx,websockets]>=2.4.3",
-    "nonebot-adapter-qq>=1.6.5",
-    "nonebot-adapter-satori>=0.13.7",
+    "nonebot-adapter-qq>=1.6.6",
+    "nonebot-adapter-satori>=0.13.8",
     "nonebot-adapter-discord>=0.1.8",
-    "nonebot-adapter-minecraft>=1.5.2",
+    "nonebot-adapter-minecraft>=1.7.1",
     "nonebot-adapter-onebot>=2.4.6",
     "nonebot-plugin-filehost>=1.1.1",
     "nonebot-plugin-send-anything-anywhere>=0.7.1",

pyproject.toml

@@ -1,5 +1,5 @@
 from nonebot.adapters.minecraft.message import MessageSegment
-from nonebot.adapters.minecraft.model import TextColor
+from nonebot.adapters.minecraft.models import Color
 
 from nonebot_plugin_alconna.uniseg.builder import MessageBuilder, build
 from nonebot_plugin_alconna.uniseg.constraint import SupportAdapter
@@ -13,7 +13,7 @@ def get_adapter(cls) -> SupportAdapter:
 
     def get_styles(self, data: dict):
         styles = []
-        if "color" in data and data["color"] and data["color"] != TextColor.WHITE:
+        if "color" in data and data["color"] and data["color"] != Color.white:
             styles.append(data["color"])
         if data.get("bold"):
             styles.append("bold")

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

@@ -2,9 +2,9 @@
 
 from nonebot.adapters import Bot, Event
 from nonebot.adapters.minecraft.bot import Bot as MinecraftBot
-from nonebot.adapters.minecraft.event.base import MessageEvent
+from nonebot.adapters.minecraft.event import MessageEvent
 from nonebot.adapters.minecraft.message import Message, MessageSegment
-from nonebot.adapters.minecraft.model import BaseComponent, ClickAction, ClickEvent, HoverAction, HoverEvent, TextColor
+from nonebot.adapters.minecraft.models import Component, ClickAction, ClickEvent, HoverAction, HoverEvent, Color
 from tarina import lang
 
 from nonebot_plugin_alconna.uniseg.constraint import SupportScope
@@ -45,7 +45,7 @@
     "white": "white",
 }
 
-for color in TextColor.__members__.values():
+for color in Color.__members__.values():
     STYLE_TYPE_MAP[color.value] = color  # type: ignore
 
 
@@ -123,19 +123,19 @@ async def button(self, seg: Button, bot: Union[Bot, None]):
                     kwargs["color"] = style
         if seg.clicked_label:
             kwargs["hover_event"] = HoverEvent(
-                action=HoverAction.SHOW_TEXT, text=[BaseComponent(text=seg.clicked_label)]
+                action=HoverAction.show_text, contents=[Component(text=seg.clicked_label)]
             )
-        if seg.flag == "link":
+        if seg.flag == "link" and seg.url:
             return MessageSegment.text(
-                label.text, **kwargs, click_event=ClickEvent(action=ClickAction.OPEN_URL, value=seg.url)
+                label.text, **kwargs, click_event=ClickEvent(action=ClickAction.open_url, value=seg.url)
             )
-        if seg.flag == "input":
+        if seg.flag == "input" and seg.text:
             return MessageSegment.text(
-                label.text, **kwargs, click_event=ClickEvent(action=ClickAction.SUGGEST_COMMAND, value=seg.text)
+                label.text, **kwargs, click_event=ClickEvent(action=ClickAction.suggest_command, value=seg.text)
             )
-        if seg.flag == "enter":
+        if seg.flag == "enter" and seg.text:
             return MessageSegment.text(
-                label.text, **kwargs, click_event=ClickEvent(action=ClickAction.RUN_COMMAND, value=seg.text)
+                label.text, **kwargs, click_event=ClickEvent(action=ClickAction.run_command, value=seg.text)
             )
         raise SerializeFailed(lang.require("nbp-uniseg", "invalid_segment").format(type="button", seg=seg))
 

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

@@ -130,11 +130,11 @@ def export(
 ) -> Callable[[Any, TS, Union[Bot, None]], Awaitable[Union[TMS, list[TMS]]]]: ...
 
 
-def export(
+def export(  # type: ignore
     func: Union[
-        Callable[[Any, TS, Union[Bot, None]], Awaitable[TMS]],
-        Callable[[Any, TS, Union[Bot, None]], Awaitable[list[TMS]]],
-        Callable[[Any, TS, Union[Bot, None]], Awaitable[Union[TMS, list[TMS]]]],
+        Callable[[Any, Segment, Union[Bot, None]], Awaitable[TMS]],
+        Callable[[Any, Segment, Union[Bot, None]], Awaitable[list[TMS]]],
+        Callable[[Any, Segment, Union[Bot, None]], Awaitable[Union[TMS, list[TMS]]]],
     ],
 ):
     sig = inspect.signature(func)

src/nonebot_plugin_alconna/uniseg/exporter.py

@@ -219,6 +219,7 @@ class Config:
 
 def fake_satori_bot_params(self_id: str = "test", platform: str = "test") -> dict:
     from nonebot.adapters.satori.models import Login, LoginStatus, User
+    from nonebot.adapters.satori.config import ClientInfo
 
     return {
         "self_id": self_id,
@@ -229,6 +230,6 @@ def fake_satori_bot_params(self_id: str = "test", platform: str = "test") -> dic
             platform=platform,
             user=User(id=self_id, name="test"),
         ),
-        "info": None,
+        "info": ClientInfo(port=5140),
         "proxy_urls": [],
     }

tests/fake.py

@@ -1,15 +1,15 @@
 def test_mc_style_text():
     from nonebot.adapters.minecraft.message import Message, MessageSegment
-    from nonebot.adapters.minecraft.model import TextColor
+    from nonebot.adapters.minecraft.models import Color
 
     from nonebot_plugin_alconna import Text, UniMessage
 
     msg = UniMessage([Text("1234").color("red", 0, 2).color("yellow"), Text("456").color("blue")])
 
     assert msg.export_sync(adapter="Minecraft") == Message(
         [
-            MessageSegment.text("12", color=TextColor.RED),
-            MessageSegment.text("34", color=TextColor.YELLOW),
-            MessageSegment.text("456", color=TextColor.BLUE),
+            MessageSegment.text("12", color=Color.red),
+            MessageSegment.text("34", color=Color.yellow),
+            MessageSegment.text("456", color=Color.blue),
         ]
     )