Skip to content

Feature: Remove CQCode parse #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ambylanc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature: Remove CQCode parse #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fbca79
feat!: remove cqcode
Ambylanc Sep 24, 2025
db41533
:rotating_light: auto fix by pre-commit hooks
pre-commit-ci[bot] Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 2 additions & 32 deletions nonebot/adapters/onebot/v11/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
description: onebot.v11.message 模块
"""

import re
from io import BytesIO
from pathlib import Path
from functools import partial
Expand Down Expand Up @@ -38,7 +37,7 @@ def __str__(self) -> str:
params = ",".join(
f"{k}={escape(str(v))}" for k, v in self.data.items() if v is not None
)
return f"[CQ:{self.type}{',' if params else ''}{params}]"
return f"[{self.type}{':' if params else ''}{params}]"

def to_rich_text(self, truncate: Optional[int] = 70) -> str:
if self.is_text():
Expand Down Expand Up @@ -297,36 +296,7 @@ def __iadd__(
@staticmethod
@override
def _construct(msg: str) -> Iterable[MessageSegment]:
def _iter_message(msg: str) -> Iterable[tuple[str, str]]:
text_begin = 0
for cqcode in re.finditer(
r"\[CQ:(?P<type>[a-zA-Z0-9-_.]+)"
r"(?P<params>"
r"(?:,[a-zA-Z0-9-_.]+=[^,\]]*)*"
r"),?\]",
msg,
):
yield "text", msg[text_begin : cqcode.pos + cqcode.start()]
text_begin = cqcode.pos + cqcode.end()
yield cqcode.group("type"), cqcode.group("params").lstrip(",")
yield "text", msg[text_begin:]

for type_, data in _iter_message(msg):
if type_ == "text":
if data:
# only yield non-empty text segment
yield MessageSegment(type_, {"text": unescape(data)})
else:
data = {
k: unescape(v)
for k, v in (
x.split("=", maxsplit=1)
for x in filter(
lambda x: x, (x.lstrip() for x in data.split(","))
)
)
}
yield MessageSegment(type_, data)
yield MessageSegment("text", {"text": unescape(msg)})

@override
def extract_plain_text(self) -> str:
Expand Down