diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-25 11:43:00 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-09-25 11:43:00 +0200 |
| commit | 96cdbcfa072c79cd3e94fa6b012494135c2497d9 (patch) | |
| tree | addbc4ab43e51cb9023115917eb632c72ee4da4f /server | |
| parent | aac0118dc3a563f4923426ec580a8491874922f4 (diff) | |
| parent | 7e7ab7a15d20e72b230d646cbd786bab014bde9d (diff) | |
| download | PeerTube-96cdbcfa072c79cd3e94fa6b012494135c2497d9.tar.gz PeerTube-96cdbcfa072c79cd3e94fa6b012494135c2497d9.tar.zst PeerTube-96cdbcfa072c79cd3e94fa6b012494135c2497d9.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'server')
| -rw-r--r-- | server/helpers/custom-validators/activitypub/actor.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index 6958b2b00..77c003cdf 100644 --- a/server/helpers/custom-validators/activitypub/actor.ts +++ b/server/helpers/custom-validators/activitypub/actor.ts | |||
| @@ -27,7 +27,7 @@ function isActorPublicKeyValid (publicKey: string) { | |||
| 27 | validator.isLength(publicKey, CONSTRAINTS_FIELDS.ACTORS.PUBLIC_KEY) | 27 | validator.isLength(publicKey, CONSTRAINTS_FIELDS.ACTORS.PUBLIC_KEY) |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | const actorNameRegExp = new RegExp('^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\\-_]+$') | 30 | const actorNameRegExp = new RegExp('^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\\-_\.]+$') |
| 31 | function isActorPreferredUsernameValid (preferredUsername: string) { | 31 | function isActorPreferredUsernameValid (preferredUsername: string) { |
| 32 | return exists(preferredUsername) && validator.matches(preferredUsername, actorNameRegExp) | 32 | return exists(preferredUsername) && validator.matches(preferredUsername, actorNameRegExp) |
| 33 | } | 33 | } |