-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
fix: 保护 @昵称(ID) 格式在命令参数解析时不被空格拆坏 #9307
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.
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
Mer3y1338
wants to merge
2
commits into
AstrBotDevs:master
Choose a base branch
from
Mer3y1338:fix/command-at-mention-space-parsing
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里的正则表达式
r"@[^@]+?\(\d+\)|[^\s]+"使用了\d+来匹配括号中的用户 ID。虽然这对于 QQ 等使用纯数字 QQ 号作为 ID 的平台非常有效,但 AstrBot 作为一个多平台机器人框架,可能会接入其他平台的适配器(例如微信 wxid、Slack、Discord 或使用 UUID 的平台),这些平台的非数字用户 ID(可能包含字母、下划线、连字符等)将无法被该正则匹配,从而导致在这些平台上包含空格的昵称仍然会被拆分。为了提高多平台兼容性,建议将
\d+替换为[\w\-]+。这样既能支持包含字母、下划线、连字符等非数字字符的 ID,又因为不允许空格而避免了误匹配普通的带空格括号文本。