diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2018-12-01 07:19:17 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-12-01 07:19:17 +0900 |
| commit | 53c559c001577afbf2e1910f7510093f7c1371ad (patch) | |
| tree | a7387647fdf4255c4459564b58959afc78dbd108 /src/models | |
| parent | Update webpack requirement from 4.26.0 to 4.26.1 (#3453) (diff) | |
| download | misskey-53c559c001577afbf2e1910f7510093f7c1371ad.tar.gz misskey-53c559c001577afbf2e1910f7510093f7c1371ad.tar.bz2 misskey-53c559c001577afbf2e1910f7510093f7c1371ad.zip | |
Allow hyphens in the middle of remote usernames (#3440)
* Allow hyphens in the middle of remote usernames
refs: d797c29db462de4a3d69a5077a1ae4d03195b6f2
* Make options fallback better
* Make options flat
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/user.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/models/user.ts b/src/models/user.ts index db10e06d8a..0e9875504b 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -147,8 +147,8 @@ export const isRemoteUser = (user: any): user is IRemoteUser => !isLocalUser(user); //#region Validators -export function validateUsername(username: string): boolean { - return typeof username == 'string' && /^[a-zA-Z0-9_]{1,20}$/.test(username); +export function validateUsername(username: string, remote?: boolean): boolean { + return typeof username == 'string' && (remote ? /^\w+([\w\.-]+\w+)?$/ : /^[a-zA-Z0-9_]{1,20}$/).test(username); } export function validatePassword(password: string): boolean { |