diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-06 22:15:31 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-06 22:15:31 +0900 |
| commit | 2b02655a3f420ddf08015e7c048d4eda12290d1d (patch) | |
| tree | 62f278e9daf760ee0859633e7cf82404a893154e /src | |
| parent | Add todo (diff) | |
| download | sharkey-2b02655a3f420ddf08015e7c048d4eda12290d1d.tar.gz sharkey-2b02655a3f420ddf08015e7c048d4eda12290d1d.tar.bz2 sharkey-2b02655a3f420ddf08015e7c048d4eda12290d1d.zip | |
Fix bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/models/user.ts | 2 | ||||
| -rw-r--r-- | src/remote/activitypub/resolve-person.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/models/user.ts b/src/models/user.ts index f817c33aa2..7c1ee498d6 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -100,7 +100,7 @@ export function validatePassword(password: string): boolean { } export function isValidName(name: string): boolean { - return typeof name == 'string' && name.length < 30 && name.trim() != ''; + return name === null || (typeof name == 'string' && name.length < 30 && name.trim() != ''); } export function isValidDescription(description: string): boolean { diff --git a/src/remote/activitypub/resolve-person.ts b/src/remote/activitypub/resolve-person.ts index 9cca50e416..39887ef776 100644 --- a/src/remote/activitypub/resolve-person.ts +++ b/src/remote/activitypub/resolve-person.ts @@ -24,7 +24,7 @@ export default async (value, verifier?: string) => { object.type !== 'Person' || typeof object.preferredUsername !== 'string' || !validateUsername(object.preferredUsername) || - (object.name != '' && !isValidName(object.name)) || + !isValidName(object.name == '' ? null : object.name) || !isValidDescription(object.summary) ) { throw new Error('invalid person'); |