Merge pull request #9 from absdf15/main

fix(renderer): fixed the issue where commands were being rendered as …

Author: fu050409

src/diceutils/renderer/_models.py

@@ -129,33 +129,45 @@ def split_and_label(text: str) -> Dict[str, str]:
     def parse_message(message: Message, config: ExportConfig) -> Optional[Message]:
         elements = message.elements
 
-        if len(elements) == 0:
+        if ele_len := len(elements) == 0:
             return None
 
         if config.dice_command_filter and message.role == -1:
             return None
 
-        if len(elements) == 1 and isinstance(elements[0], Image):
+        if ele_len == 1 and isinstance(elements[0], Image):
             return message if config.display_image else None
 
         ele_iter = iter(elements)
         first_ele = next(ele_iter)
-        is_external_comment = first_ele.content.startswith(("(", "（"))
         is_text = isinstance(first_ele, Text)
+        is_external_comment = first_ele.content.startswith(("(", "（"))
+        
         if config.external_comment_filter and is_text and is_external_comment:
             return None
+        
+        is_command = first_ele.content.startswith((".", "。", "/"))
+        
+        if config.dice_command_filter and is_text and is_command:
+            return None
 
-        if is_text and is_external_comment:
-            first_ele.set_tag("outside")
-            for ele in ele_iter:
-                if isinstance(ele, Text):
-                    ele.set_tag("outside")
-            return message
-
-        new_elements = []
         if is_text:
-            for text, tag in Renderer.split_and_label(first_ele.content).items():
-                new_elements.append(Text(text, tag))
+            if is_external_comment:
+                first_ele.set_tag("outside")
+                for ele in ele_iter:
+                    if isinstance(ele, Text):
+                        ele.set_tag("outside")
+                return message
+            elif is_command:
+                first_ele.set_tag("command")
+                for ele in ele_iter:
+                    if isinstance(ele, Text):
+                        ele.set_tag("command")
+                return message
+            else: 
+                new_elements = []
+                for text, tag in Renderer.split_and_label(first_ele.content).items():
+                    new_elements.append(Text(text, tag))
 
         for ele in ele_iter:
             if isinstance(ele, Text):

src/diceutils/renderer/html.py

@@ -161,6 +161,9 @@ def _render_act(self, element: Element, is_first: bool = False):
 
     def _render_dicer(self, element: Element) -> str:
         return f"<span>{element.content}</span>"
+    
+    def _render_command(self, element: Element) -> str:
+        return f"<span>{element.content}</span>"
 
     def _render_speak(self, element: Element) -> str:
         content = "“" + element.content.strip('"“”') + "”"
@@ -193,6 +196,8 @@ def render_message(self, message: Message) -> None:
                     text += self._render_outside(element)
                 elif element.tag == "speak":
                     text += self._render_speak(element)
+                elif element.tag == "command":
+                    text += self._render_command(element)
         text += f'<span class="tooltiptext">{message.date}</span></p></div>'
         text += "\n</div>"
         self.plain_text += text

tests/test_renderer.py

@@ -16,9 +16,27 @@ def test_render():
         },
         {"type": "image", "data": {"url": "http://a.com/2.png"}},
     ]
+    msg_content_3 = [
+        {
+            "type": "text",
+            "data": {
+                "text": ".rd10*5"
+            }
+        }
+    ]
+    msg_content_4 = [
+         {
+            "type": "text",
+            "data": {
+                "text": "[苏向夜]掷骰: 1D10*5={10}*5=50"
+            }
+        }
+    ]
     messages.add_message("230234235", Role.GM, "苏向夜", "date", msg_content_1)
     messages.add_message("130324324", Role.PL, "少年狐", "date", msg_content_1)
     messages.add_message("120232412", Role.PL, "Aruvelut", "date", msg_content_2)
+    messages.add_message("230234235", Role.GM, "苏向夜", "date", msg_content_3)
+    messages.add_message("3371047314", Role.DICER, "骰娘", "date", msg_content_4)
     messages.add_message(
         "130232542",
         Role.OB,
@@ -30,4 +48,4 @@ def test_render():
     )
 
     renderer = Renderer.render(messages, HTMLRenderer())
-    renderer.export("测试")
+    renderer.export("测试")