From 3a7182bfb5734599321fc03ea77c48b4dbc326d5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 3 Dec 2022 19:42:05 +0900 Subject: Fastify (#9106) * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * fix * Update SignupApiService.ts * wip * wip * Update ClientServerService.ts * wip * wip * wip * Update WellKnownServerService.ts * wip * wip * update des * wip * Update ApiServerService.ts * wip * update deps * Update WellKnownServerService.ts * wip * update deps * Update ApiCallService.ts * Update ApiCallService.ts * Update ApiServerService.ts --- packages/backend/src/server/api/endpoints/drive/files/create.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'packages/backend/src/server/api/endpoints') diff --git a/packages/backend/src/server/api/endpoints/drive/files/create.ts b/packages/backend/src/server/api/endpoints/drive/files/create.ts index d394f5c3da..3f4485fc8b 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/create.ts @@ -78,8 +78,8 @@ export default class extends Endpoint { ) { super(meta, paramDef, async (ps, me, _, file, cleanup, ip, headers) => { // Get 'name' parameter - let name = ps.name ?? file.originalname; - if (name !== undefined && name !== null) { + let name = ps.name ?? file!.name ?? null; + if (name != null) { name = name.trim(); if (name.length === 0) { name = null; @@ -88,8 +88,6 @@ export default class extends Endpoint { } else if (!this.driveFileEntityService.validateFileName(name)) { throw new ApiError(meta.errors.invalidFileName); } - } else { - name = null; } const meta = await this.metaService.fetch(); @@ -98,7 +96,7 @@ export default class extends Endpoint { // Create file const driveFile = await this.driveService.addFile({ user: me, - path: file.path, + path: file!.path, name, comment: ps.comment, folderId: ps.folderId, -- cgit v1.2.3-freya