Skip to content

fix: curly brace escaping in regular expression #570

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

Merged
merged 1 commit into from
May 30, 2023
Merged

fix: curly brace escaping in regular expression #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/modules/Message/utils/tokens/__tests__/tokenizeUtils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('getUserMentionRegex', () => {
] as User[];
const templatePrefix = '@';
const result = getUserMentionRegex(mentionedUsers, templatePrefix);
expect(result).toEqual(/(@{1}|@{2})/g);
expect(result).toEqual(/(@\{1\}|@\{2\})/g);
});

it('should return a correct regex pattern; userId includes some patterns need to be escaped', () => {
Expand All @@ -26,7 +26,7 @@ describe('getUserMentionRegex', () => {
] as User[];
const templatePrefix = '@';
const result = getUserMentionRegex(mentionedUsers, templatePrefix);
expect(result).toEqual(/(@{1\*}|@{2\+})/g);
expect(result).toEqual(/(@\{1\*\}|@\{2\+\})/g);
});
});

Expand Down
8 changes: 6 additions & 2 deletions src/modules/Message/utils/tokens/tokenize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@ export function getUserMentionRegex(mentionedUsers: User[], templatePrefix_: str
// If user.id includes these patterns, need to convert it into an escaped one
/([.*+?^${}()|[\]\\])/g,
'\\$1');
return `${templatePrefix}{${userId}}`;
/**
* //{ And //} are also for escaping
* because curly braces `{}` are metacharacters in regular expressions used to specify repetition
*/
return `${templatePrefix}\\{${userId}\\}`;
}).join('|')})`, 'g');
}

export function identifyMentions({
tokens,
mentionedUsers = [],
templatePrefix = USER_MENTION_PREFIX,
}: IdentifyMentionsType): (MentionToken|UndeterminedToken)[] {
}: IdentifyMentionsType): (MentionToken | UndeterminedToken)[] {
if (!mentionedUsers?.length) {
return tokens;
}
Expand Down