✨ Text.br()

resolve #110

Author: RF-Tar-Railt

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

@@ -1,10 +1,8 @@
 from pathlib import Path
 from base64 import b64decode
-from typing import TYPE_CHECKING
 
 from nonebot.adapters import Bot, Event
 from nonebot.adapters.satori.message import Message
-from nonebot.adapters.satori.event import MessageEvent, ReactionEvent, InteractionCommandMessageEvent
 from nonebot.adapters.satori.message import MessageSegment
 from nonebot.adapters.satori.message import At as AtSegment
 from nonebot.adapters.satori.message import File as FileSegment
@@ -16,6 +14,7 @@
 from nonebot.adapters.satori.message import Video as VideoSegment
 from nonebot.adapters.satori.message import Button as ButtonSegment
 from nonebot.adapters.satori.message import RenderMessage as RenderMessageSegment
+from nonebot.adapters.satori.event import MessageEvent, ReactionEvent, InteractionCommandMessageEvent
 
 from nonebot_plugin_alconna.uniseg.constraint import SupportAdapter
 from nonebot_plugin_alconna.uniseg.builder import MessageBuilder, build

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

@@ -6,9 +6,9 @@
 from nonebot.adapters.satori.bot import Bot as SatoriBot
 from nonebot.adapters.satori.message import Text as _Text
 from nonebot.adapters.satori.message import STYLE_TYPE_MAP
-from nonebot.adapters.satori.event import NoticeEvent, MessageEvent, ReactionEvent, InteractionCommandMessageEvent
 from nonebot.adapters.satori.message import Message, MessageSegment
 from nonebot.adapters.satori.models import ChannelType, MessageObject
+from nonebot.adapters.satori.event import NoticeEvent, MessageEvent, ReactionEvent, InteractionCommandMessageEvent
 
 from nonebot_plugin_alconna.uniseg.target import Target
 from nonebot_plugin_alconna.uniseg.constraint import SupportScope
@@ -79,21 +79,27 @@ def get_message_id(self, event: Event) -> str:
         return str(event.message.id)
 
     @export
-    async def text(self, seg: Text, bot: Union[Bot, None]) -> "MessageSegment":
+    async def text(self, seg: Text, bot: Union[Bot, None]):
         if not seg.styles:
             return MessageSegment.text(seg.text)
-        if seg.extract_most_style() == "br":
-            return MessageSegment.br()
-        if seg.extract_most_style() == "link":
-            if not getattr(seg, "_children", []):
-                return MessageSegment.link(seg.text)
-            return MessageSegment.link(seg.text, seg._children[0].text)  # type: ignore
         if seg.extract_most_style() == "markdown":
             return _Text("text", {"text": seg.text, "styles": {(0, len(seg.text)): ["chronocat:markdown"]}})
-        styles = seg.styles.copy()
-        for scale, style in seg.styles.items():
-            styles[scale] = [STYLE_TYPE_MAP.get(s, s) for s in style]
-        return _Text("text", {"text": seg.text, "styles": styles})
+        res = Message()
+        for part in seg.style_split():
+            if part.extract_most_style() == "br":
+                res.append(MessageSegment.br())
+            elif part.extract_most_style() == "link":
+                if not getattr(part, "_children", []):
+                    res.append(MessageSegment.link(part.text))
+                else:
+                    res.append(MessageSegment.link(part.text, part._children[0].text))  # type: ignore
+            else:
+                styles = part.styles.copy()
+                for scale, style in part.styles.items():
+                    styles[scale] = [STYLE_TYPE_MAP.get(s, s) for s in style]
+                res.append(_Text("text", {"text": part.text, "styles": styles}))
+        res.__merge_text__()
+        return res
 
     @export
     async def at(self, seg: At, bot: Union[Bot, None]) -> "MessageSegment":
@@ -247,7 +253,9 @@ async def reaction(self, emoji: Emoji, mid: Any, bot: Bot, context: Union[Target
         if isinstance(context, (MessageEvent, NoticeEvent)) and context.channel:
             channel = mid.channel or context.channel
             if delete:
-                return await bot.reaction_delete(channel_id=channel.id, message_id=_mid.id, emoji=emoji.name or emoji.id)
+                return await bot.reaction_delete(
+                    channel_id=channel.id, message_id=_mid.id, emoji=emoji.name or emoji.id
+                )
             return await bot.reaction_create(channel_id=channel.id, message_id=_mid.id, emoji=emoji.name or emoji.id)
 
     def get_reply(self, mid: Any):

src/nonebot_plugin_alconna/uniseg/segment.py

@@ -242,6 +242,10 @@ class Text(Segment):
     text: str
     styles: dict[tuple[int, int], list[str]] = field(default_factory=dict)
 
+    @staticmethod
+    def br():
+        return Text("\n", {(0, 1): ["br"]})
+
     def __post_init__(self):
         self.text = str(self.text)
 
@@ -346,6 +350,9 @@ def __str__(self) -> str:
                 result.append(text[right : scale[0]])
             right = scale[1]
             prefix = "".join(f"<{style}>" for style in styles[scale])
+            if prefix == "<br>":
+                result.append("<br/>")
+                continue
             suffix = "".join(f"</{style}>" for style in reversed(styles[scale]))
             result.append(prefix + text[scale[0] : scale[1]] + suffix)
         result.append(text[right:])
@@ -368,12 +375,10 @@ def __rich__(self):
         right = scales[0][1]
         for scale in scales:
             if scale[0] > right:
-                result.append("\033[0m")
                 result.append(text[right : scale[0]])
             right = scale[1]
             prefix = ";".join(f"{STYLE_TYPE_MAP[style]}" for style in styles[scale])
-            result.append(f"\033[{prefix}m{text[scale[0] : scale[1]]}")
-        result.append("\033[0m")
+            result.append(f"\033[{prefix}m{text[scale[0] : scale[1]]}\033[0m")
         result.append(text[right:])
         return "".join(result)
 
@@ -404,8 +409,7 @@ def style_split(self):
         for scale in scales:
             if scale[0] > right:
                 result.append(Text(text[right : scale[0]]))
-            result.append(Text(text[scale[0] : scale[1]], {(scale[0] - left, scale[1] - left): styles[scale]}))
-            left = scale[0]
+            result.append(Text(text[scale[0] : scale[1]], {(0, scale[1] - scale[0]): styles[scale]}))
             right = scale[1]
         if right < len(text):
             result.append(Text(text[right:]))

tests/test_uniseg.py

@@ -33,7 +33,7 @@ def test_uniseg():
         Text("man").italic(0, 1),
     ]
     assert text1.replace("o", "e") == Text("helle werld man").color("red", 0, -3).italic(3, -2)
-    assert f"{text1:#}" == f"{ansi(31)}hel{ansi(31, 3)}lo world {ansi(3)}m{ansi(0)}an"
+    assert f"{text1:#}" == f"{ansi(31)}hel{ansi(0)}{ansi(31, 3)}lo world {ansi(0)}{ansi(3)}m{ansi(0)}an"
     pat = select(Text)
     assert pat.first.validate(Text("foobar")).value() == Text("foobar")
     assert pat.first.validate(Video(url="foobar")(Text("foobar"))).value() == Text("foobar")