From 89ef21e3b0ea4c27d5cb5ef5b28fb6d376878925 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 24 Sep 2022 16:53:53 +0900 Subject: [PATCH] fix type --- packages/backend/package.json | 1 + packages/backend/src/core/EmailService.ts | 2 +- .../backend/src/server/api/endpoints/admin/emoji/list.ts | 4 ++-- packages/backend/yarn.lock | 7 +++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index 79a57fa35..eccba10ed 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -32,6 +32,7 @@ "@sinonjs/fake-timers": "9.1.2", "@syuilo/aiscript": "0.11.1", "@types/pg": "8.6.5", + "@types/unzipper": "0.10.5", "ajv": "8.11.0", "archiver": "5.3.1", "autobind-decorator": "2.4.0", diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts index 4c5cf7dfc..019b9087c 100644 --- a/packages/backend/src/core/EmailService.ts +++ b/packages/backend/src/core/EmailService.ts @@ -159,7 +159,7 @@ export class EmailService { validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので validateDisposable: true, // 捨てアドかどうかチェック validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので - }) : { valid: true }; + }) : { valid: true, reason: null }; const available = exist === 0 && validated.valid; diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts index 8624229db..271b14212 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts @@ -41,8 +41,8 @@ export const meta = { optional: false, nullable: true, }, host: { - type: 'null', - optional: false, + type: 'string', + optional: false, nullable: true, description: 'The local host is represented with `null`. The field exists for compatibility with other API endpoints that return files.', }, url: { diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock index 34127e1ad..f2ea0b0a5 100644 --- a/packages/backend/yarn.lock +++ b/packages/backend/yarn.lock @@ -1762,6 +1762,13 @@ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d" integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A== +"@types/unzipper@0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@types/unzipper/-/unzipper-0.10.5.tgz#36a963cf025162b4ac31642590cb4192971d633b" + integrity sha512-NrLJb29AdnBARpg9S/4ktfPEisbJ0AvaaAr3j7Q1tg8AgcEUsq2HqbNzvgLRoWyRtjzeLEv7vuL39u1mrNIyNA== + dependencies: + "@types/node" "*" + "@types/uuid@8.3.4": version "8.3.4" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"