profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix username/mention regexes

Browse source 
* Allow underscore instead of hypen
* Fix domain part handling
* Add tests for remote mention
This commit is contained in:
unarist 2018-04-09 01:10:04 +09:00
parent 34281de04e
commit 3c4235067f
6 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/models/app.ts
View file

@ -24,7 +24,7 @@ export type IApp = {
};
export function isValidNameId(nameId: string): boolean {
return typeof nameId == 'string' && /^[a-zA-Z0-9\-]{3,30}$/.test(nameId);
return typeof nameId == 'string' && /^[a-zA-Z0-9_]{3,30}$/.test(nameId);
}
/**

2
src/models/user.ts
View file

@ -89,7 +89,7 @@ export const isRemoteUser = (user: any): user is IRemoteUser =>
//#region Validators
export function validateUsername(username: string): boolean {
return typeof username == 'string' && /^[a-zA-Z0-9\-]{3,20}$/.test(username);
return typeof username == 'string' && /^[a-zA-Z0-9_]{3,20}$/.test(username);
}
export function validatePassword(password: string): boolean {