From 2b02655a3f420ddf08015e7c048d4eda12290d1d Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 6 Apr 2018 22:15:31 +0900 Subject: [PATCH] Fix bug --- src/models/user.ts | 2 +- 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 f817c33aa..7c1ee498d 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 9cca50e41..39887ef77 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');