diff options
| author | noonworks <noonworks@gmail.com> | 2023-02-20 08:13:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 08:13:37 +0900 |
| commit | ea92254b731807fe7bc4bfe45339007459f5c91c (patch) | |
| tree | b5c239b0dd5e53e42529773c0b1fdb84cac6f70e /packages/backend/src | |
| parent | fix typescript version on vscode (diff) | |
| download | sharkey-ea92254b731807fe7bc4bfe45339007459f5c91c.tar.gz sharkey-ea92254b731807fe7bc4bfe45339007459f5c91c.tar.bz2 sharkey-ea92254b731807fe7bc4bfe45339007459f5c91c.zip | |
refactor: 型エラー修正 / Fix type errors backend (#9983)
* refactor: fix type errors in backend
* revert some changes
* なるべくJS挙動を変えない方法に修正
* Update packages/backend/src/server/api/ApiCallService.ts
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* コンフリクトするファイルを削除
---------
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/core/PushNotificationService.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/api/ApiCallService.ts | 4 | ||||
| -rw-r--r-- | packages/backend/src/server/api/GetterService.ts | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packages/backend/src/core/PushNotificationService.ts b/packages/backend/src/core/PushNotificationService.ts index 75bf4b0e01..4b7ca5c968 100644 --- a/packages/backend/src/core/PushNotificationService.ts +++ b/packages/backend/src/core/PushNotificationService.ts @@ -23,7 +23,7 @@ type pushNotificationsTypes = { // Reduce length because push message servers have character limits function truncateBody<T extends keyof pushNotificationsTypes>(type: T, body: pushNotificationsTypes[T]): pushNotificationsTypes[T] { - if (body === undefined) return body; + if (typeof body !== 'object') return body; return { ...body, diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts index cc27b36966..347fa59d36 100644 --- a/packages/backend/src/server/api/ApiCallService.ts +++ b/packages/backend/src/server/api/ApiCallService.ts @@ -108,9 +108,9 @@ export class ApiCallService implements OnApplicationShutdown { const [path] = await createTemp(); await pump(multipartData.file, fs.createWriteStream(path)); - const fields = {} as Record<string, string | undefined>; + const fields = {} as Record<string, unknown>; for (const [k, v] of Object.entries(multipartData.fields)) { - fields[k] = v.value; + fields[k] = typeof v === 'object' && 'value' in v ? v.value : undefined; } const token = fields['i']; diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts index c7f9916f97..c94884a78c 100644 --- a/packages/backend/src/server/api/GetterService.ts +++ b/packages/backend/src/server/api/GetterService.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; import type { NotesRepository, UsersRepository } from '@/models/index.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; -import type { User } from '@/models/entities/User.js'; +import type { LocalUser, RemoteUser, User } from '@/models/entities/User.js'; import type { Note } from '@/models/entities/Note.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; @@ -45,7 +45,7 @@ export class GetterService { throw new IdentifiableError('15348ddd-432d-49c2-8a5a-8069753becff', 'No such user.'); } - return user; + return user as LocalUser | RemoteUser; } /** |