🐛 fix kook kmarkdown parse

resolve #91

Author: RF-Tar-Railt

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

@@ -18,10 +18,8 @@
 
 CHN = re.compile(r"\(chn\)(?P<id>.+?)\(chn\)")
 EMJ = re.compile(r"\(emj\)(?P<name>.+?)\(emj\)\[(?P<id>[^\[]+?)\]")
-EMJ1 = re.compile(r":(?P<id>.+?):")
 NO_CHN = re.compile(r"\[\(chn\)(?P<id>.+?)\(chn\)\]\(.+\)")
 NO_EMJ = re.compile(r"\[\(emj\)(?P<name>.+?)\(emj\)\[(?P<id>[^\[]+?)\]\]\(.+\)")
-NO_EMJ1 = re.compile(r"\[:(?P<id>.+?):\]\(.+\)")
 
 
 class KookMessageBuilder(MessageBuilder):
@@ -58,9 +56,6 @@ def preprocess(self, source: Message[MessageSegment]) -> Message[MessageSegment]
             for mat in EMJ.finditer(content):
                 mats[mat.start()] = MessageSegment("emoji", {"id": mat.group("id"), "name": mat.group("name")})
                 spans[mat.start()] = mat.end()
-            for mat in EMJ1.finditer(content):
-                mats[mat.start()] = MessageSegment("emoji", {"id": mat.group("id")})
-                spans[mat.start()] = mat.end()
             for mat in NO_CHN.finditer(content):
                 if mat.start() + 1 in spans:
                     del spans[mat.start() + 1]
@@ -69,10 +64,6 @@ def preprocess(self, source: Message[MessageSegment]) -> Message[MessageSegment]
                 if mat.start() + 1 in spans:
                     del spans[mat.start() + 1]
                     del mats[mat.start() + 1]
-            for mat in NO_EMJ1.finditer(content):
-                if mat.start() + 1 in spans:
-                    del spans[mat.start() + 1]
-                    del mats[mat.start() + 1]
             if not mats:
                 res.append(MessageSegment.KMarkdown(content))
                 continue
@@ -88,7 +79,7 @@ def preprocess(self, source: Message[MessageSegment]) -> Message[MessageSegment]
                         text = ""
                     res.append(mats[_index])
                     continue
-                if _index >= spans[current]:
+                if current in spans and _index >= spans[current]:
                     in_mat = False
                 if not in_mat:
                     text += char
@@ -108,8 +99,6 @@ def kmarkdown(self, seg: KMarkdown):
             mat = re.search(r"\(emj\)(?P<name>[^()\[\]]+)\(emj\)\[(?P<id>[^\[\]]+)\]", content)
             if mat:
                 return Emoji(mat["id"], mat["name"])
-        if content.startswith(":") and (mat := re.search(r":(?P<id>[^:]+):", content)):
-            return Emoji(mat["id"])
         return Text(seg.data["content"]).mark(0, len(seg.data["content"]), "markdown")
 
     @build("mention")

tests/test_kook.py

@@ -29,3 +29,11 @@ def test_kook():
     assert res1.matched
     assert res1.some_arg == "[(met)123456(met)](42345)"
     assert res1.some_arg1 == "12345678"
+
+    msg2 = Message(MessageSegment.KMarkdown("/foo 1:2:3"))
+    alc2 = Alconna("/foo", Args["some_arg", str])
+    res2 = alc2.parse(msg2, ctx)
+    assert res2.matched
+    assert res2.some_arg == "1:2:3"
+    assert alc2.parse(Message(MessageSegment.text("/foo :aaa:")), ctx).matched
+    assert alc2.parse(Message([MessageSegment.text("/foo "), MessageSegment.KMarkdown(":aaa:")]), ctx).matched