stryan/matrix.to
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #138 from matrix-org/leniant-identifiers

Browse Source 
Make identifier regexes closer to the spec
This commit is contained in:
Jorik Schellekens 2020-09-24 10:20:59 +01:00 committed by GitHub
commit ff62521614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/parser/parser.ts
View File

@ -16,13 +16,13 @@ import {
*/ */
type Verifier<A> = [RegExp, A]; type Verifier<A> = [RegExp, A];
export const roomVerifiers: Verifier<LinkKind.Alias | LinkKind.RoomId>[] = [ export const roomVerifiers: Verifier<LinkKind.Alias | LinkKind.RoomId>[] = [
[/^#([^/:]+?):(.+)$/, LinkKind.Alias], [/^#([^:]*):(.+)$/, LinkKind.Alias],
[/^!([^/:]+?):(.+)$/, LinkKind.RoomId], [/^!([^:]*):(.+)$/, LinkKind.RoomId],
]; ];
export const verifiers: Verifier<LinkKind>[] = [ export const verifiers: Verifier<LinkKind>[] = [
[/^[!#]([^/:]+?):(.+?)\/\$([^/:]+?)$/, LinkKind.Permalink], [/^[!#]([^:]*):(.+)\/\$([^:]+):(.+)$/, LinkKind.Permalink],
[/^@([^/:]+?):(.+)$/, LinkKind.UserId], [/^@([^:]+):(.+)$/, LinkKind.UserId],
[/^\+([^/:]+?):(.+)$/, LinkKind.GroupId], [/^\+([^:]+):(.+)$/, LinkKind.GroupId],
...roomVerifiers, ...roomVerifiers,
]; ];