diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts index 137bc45822..c1ac5ceea2 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ApiError } from '@/server/api/error.js'; import { AbuseReportNotificationRecipientEntityService, @@ -79,7 +79,7 @@ export const paramDef = { 'name', 'method', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/delete.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/delete.ts index 4bdac5b70c..1511ba3b70 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/delete.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AbuseReportNotificationService } from '@/core/AbuseReportNotificationService.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { required: [ 'id', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts index ecec5cef33..8aed481af1 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/list.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AbuseReportNotificationRecipientEntityService, } from '@/core/entities/AbuseReportNotificationRecipientEntityService.js'; @@ -41,7 +41,7 @@ export const paramDef = { }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts index 504233a101..c192ccbe4a 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/show.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AbuseReportNotificationRecipientEntityService, } from '@/core/entities/AbuseReportNotificationRecipientEntityService.js'; @@ -46,7 +46,7 @@ export const paramDef = { }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts index ce8818b99d..9cd455c402 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-report/notification-recipient/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ApiError } from '@/server/api/error.js'; import { AbuseReportNotificationRecipientEntityService, @@ -84,7 +84,7 @@ export const paramDef = { 'name', 'method', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts index 0cc883a260..35907183d9 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AbuseUserReportsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -93,7 +93,7 @@ export const paramDef = { forwarded: { type: 'boolean', default: false }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts index 73ad834794..d5fa92a73d 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository } from '@/models/_.js'; import { SignupService } from '@/core/SignupService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -39,7 +39,7 @@ export const paramDef = { password: passwordSchema, }, required: ['username', 'password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts index fe7f014f4e..53e202aedd 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository } from '@/models/_.js'; import { QueueService } from '@/core/QueueService.js'; import { DI } from '@/di-symbols.js'; @@ -27,7 +27,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/find-by-email.ts b/packages/backend/src/server/api/endpoints/admin/accounts/find-by-email.ts index 2cc0783e1b..d630d582ba 100644 --- a/packages/backend/src/server/api/endpoints/admin/accounts/find-by-email.ts +++ b/packages/backend/src/server/api/endpoints/admin/accounts/find-by-email.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserProfilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -39,7 +39,7 @@ export const paramDef = { email: { type: 'string' }, }, required: ['email'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/ad/create.ts b/packages/backend/src/server/api/endpoints/admin/ad/create.ts index 967d6515bf..61fcc8a3ae 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AdsRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { dayOfWeek: { type: 'integer' }, }, required: ['url', 'memo', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt', 'imageUrl', 'dayOfWeek'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts index 8f388bcaf7..2fb0fdab38 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AdsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -34,7 +34,7 @@ export const paramDef = { id: { type: 'string', format: 'misskey:id' }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/ad/list.ts b/packages/backend/src/server/api/endpoints/admin/ad/list.ts index 13b55391cc..591cf070c7 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AdsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { publishing: { type: 'boolean', default: null, nullable: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/ad/update.ts b/packages/backend/src/server/api/endpoints/admin/ad/update.ts index 06457704d8..ba24da788c 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AdsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -43,7 +43,7 @@ export const paramDef = { dayOfWeek: { type: 'integer' }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts index 5a64d04672..fbc9d76562 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; export const meta = { @@ -66,7 +66,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id', nullable: true, default: null }, }, required: ['title', 'text', 'imageUrl'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts index bf49cf81d7..13c58afb06 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AnnouncementsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; @@ -34,7 +34,7 @@ export const paramDef = { id: { type: 'string', format: 'misskey:id' }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts index bcc4a98a11..b9d02098f0 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts @@ -8,7 +8,7 @@ import type { AnnouncementsRepository, AnnouncementReadsRepository } from '@/mod import type { MiAnnouncement } from '@/models/Announcement.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; @@ -74,7 +74,7 @@ export const paramDef = { status: { type: 'string', enum: ['all', 'active', 'archived'], default: 'active' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts index b9bebcc4d9..bf9ed3c4f9 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AnnouncementsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; @@ -43,7 +43,7 @@ export const paramDef = { isActive: { type: 'boolean' }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts index ef2b729988..25e1b27778 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AvatarDecorationService } from '@/core/AvatarDecorationService.js'; export const meta = { @@ -28,7 +28,7 @@ export const paramDef = { } }, }, required: ['name', 'description', 'url'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts index 1de2ed3c4e..0b3f892a9e 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { AvatarDecorationService } from '@/core/AvatarDecorationService.js'; import { ApiError } from '../../../error.js'; @@ -27,7 +27,7 @@ export const paramDef = { id: { type: 'string', format: 'misskey:id' }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts index b78235b2bd..f7b7684a75 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts @@ -8,7 +8,7 @@ import type { AnnouncementsRepository, AnnouncementReadsRepository } from '@/mod import type { MiAnnouncement } from '@/models/Announcement.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; @@ -79,7 +79,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id', nullable: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts index e9e4645078..fb1ce0ecb5 100644 --- a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { AvatarDecorationService } from '@/core/AvatarDecorationService.js'; import { ApiError } from '../../../error.js'; @@ -34,7 +34,7 @@ export const paramDef = { } }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/delete-account.ts b/packages/backend/src/server/api/endpoints/admin/delete-account.ts index 1f76368022..91729c6a53 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-account.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DeleteAccountService } from '@/core/DeleteAccountService.js'; import { DI } from '@/di-symbols.js'; @@ -25,7 +25,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts index 25ae2418e7..86f72c60c6 100644 --- a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -25,7 +25,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts index d0cf6c078f..c9716bae3f 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -21,7 +21,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts index 8b8cf4f5e9..d8e61b0997 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts @@ -7,7 +7,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -24,7 +24,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/drive/files.ts b/packages/backend/src/server/api/endpoints/admin/drive/files.ts index 493a777730..eb52729450 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/files.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { DriveFilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; @@ -47,7 +47,7 @@ export const paramDef = { }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts index b75951cb46..1e9faaa3df 100644 --- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts +++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { DriveFilesRepository, UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; import { IdService } from '@/core/IdService.js'; @@ -173,7 +173,7 @@ export const paramDef = { { required: ['fileId'] }, { required: ['url'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts index c25393a82e..8d57737afb 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { @@ -28,7 +28,7 @@ export const paramDef = { } }, }, required: ['ids', 'aliases'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts index 55524e33d8..7cecdd7ef9 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; @@ -60,7 +60,7 @@ export const paramDef = { } }, }, required: ['name', 'fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts index 619d712625..f9d234d2ca 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { EmojisRepository } from '@/models/_.js'; import type { MiDriveFile } from '@/models/DriveFile.js'; import { DI } from '@/di-symbols.js'; @@ -54,7 +54,7 @@ export const paramDef = { emojiId: { type: 'string', format: 'misskey:id' }, }, required: ['emojiId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts index 74ec981816..aa064edc48 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { @@ -25,7 +25,7 @@ export const paramDef = { } }, }, required: ['ids'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts index f6d24b08f0..7c4e77db11 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { @@ -31,7 +31,7 @@ export const paramDef = { id: { type: 'string', format: 'misskey:id' }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts index 765fb84769..25a22921ab 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -21,7 +21,7 @@ export const paramDef = { fileId: { type: 'string', format: 'misskey:id' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts index 7207a2694f..27b1bdac3f 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { EmojisRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { UtilityService } from '@/core/UtilityService.js'; @@ -78,7 +78,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export 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 37c7cd9553..0d49b2f5aa 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { EmojisRepository } from '@/models/_.js'; import type { MiEmoji } from '@/models/Emoji.js'; import { QueryService } from '@/core/QueryService.js'; @@ -72,7 +72,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts index d4d4787c4f..605ca59e03 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { @@ -28,7 +28,7 @@ export const paramDef = { } }, }, required: ['ids', 'aliases'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts index 35922994a3..dd2376e021 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { @@ -28,7 +28,7 @@ export const paramDef = { } }, }, required: ['ids', 'aliases'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts index 68be6aeb5e..02a70bd952 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { @@ -30,7 +30,7 @@ export const paramDef = { }, }, required: ['ids'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts index e65753a44a..c63faeaec8 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; export const meta = { @@ -30,7 +30,7 @@ export const paramDef = { }, }, required: ['ids'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts index d930ffd2e9..b53ac569f3 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -63,7 +63,7 @@ export const paramDef = { { required: ['id'] }, { required: ['name'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts index 3c51a1cfe0..83d1295269 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; @@ -25,7 +25,7 @@ export const paramDef = { host: { type: 'string' }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts index 05bbce9814..74f51a03e9 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { InstancesRepository } from '@/models/_.js'; import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js'; import { UtilityService } from '@/core/UtilityService.js'; @@ -26,7 +26,7 @@ export const paramDef = { host: { type: 'string' }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts index e5d9fc80cd..fb815f7b36 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { QueueService } from '@/core/QueueService.js'; @@ -25,7 +25,7 @@ export const paramDef = { host: { type: 'string' }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts index ceb81a46a9..62247aa5ed 100644 --- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { InstancesRepository } from '@/models/_.js'; import { UtilityService } from '@/core/UtilityService.js'; import { DI } from '@/di-symbols.js'; @@ -29,7 +29,7 @@ export const paramDef = { moderationNote: { type: 'string' }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts index 3de96adf87..02ee373750 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DataSource } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -32,7 +32,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts index c5bfa1f2ab..3645fbdc29 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { DataSource } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -45,7 +45,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts index 2155f90711..fd1fcba5b3 100644 --- a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts +++ b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserIpsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; @@ -44,7 +44,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/invite/create.ts b/packages/backend/src/server/api/endpoints/admin/invite/create.ts index f4f5aae065..61c4794ba3 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RegistrationTicketsRepository } from '@/models/_.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { IdService } from '@/core/IdService.js'; @@ -48,7 +48,7 @@ export const paramDef = { expiresAt: { type: 'string', nullable: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/invite/list.ts b/packages/backend/src/server/api/endpoints/admin/invite/list.ts index 11113c7ac5..294974e15f 100644 --- a/packages/backend/src/server/api/endpoints/admin/invite/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/invite/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RegistrationTicketsRepository } from '@/models/_.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { sort: { type: 'string', enum: ['+createdAt', '-createdAt', '+usedAt', '-usedAt'] }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 072c3e99f1..195c0190c2 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { MetaService } from '@/core/MetaService.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; @@ -502,7 +502,7 @@ export const paramDef = { properties: { }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/promo/create.ts b/packages/backend/src/server/api/endpoints/admin/promo/create.ts index 5915139862..3b09493866 100644 --- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { PromoNotesRepository } from '@/models/_.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; @@ -41,7 +41,7 @@ export const paramDef = { expiresAt: { type: 'integer' }, }, required: ['noteId', 'expiresAt'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts index 7abc3028d0..37ef81dd82 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { QueueService } from '@/core/QueueService.js'; @@ -22,7 +22,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts index f2cb7db539..b2e824f30a 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts @@ -7,7 +7,7 @@ import { URL } from 'node:url'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DeliverQueue } from '@/core/QueueModule.js'; export const meta = { @@ -44,7 +44,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts index 750e28f77b..308649b2cd 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts @@ -7,7 +7,7 @@ import { URL } from 'node:url'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { InboxQueue } from '@/core/QueueModule.js'; export const meta = { @@ -44,7 +44,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts index 9bf5fed0b9..abe8f9f7e9 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { QueueService } from '@/core/QueueService.js'; @@ -24,7 +24,7 @@ export const paramDef = { type: { type: 'string', enum: ['deliver', 'inbox'] }, }, required: ['type'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts index e3f47fc9f4..6411cea088 100644 --- a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts +++ b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, ObjectStorageQueue, SystemQueue, UserWebhookDeliverQueue, SystemWebhookDeliverQueue } from '@/core/QueueModule.js'; export const meta = { @@ -44,7 +44,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/relays/add.ts b/packages/backend/src/server/api/endpoints/admin/relays/add.ts index b461635f0a..561b5e1c03 100644 --- a/packages/backend/src/server/api/endpoints/admin/relays/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/relays/add.ts @@ -7,7 +7,7 @@ import { URL } from 'node:url'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RelayService } from '@/core/RelayService.js'; import { ApiError } from '../../../error.js'; @@ -60,7 +60,7 @@ export const paramDef = { inbox: { type: 'string' }, }, required: ['inbox'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/relays/list.ts b/packages/backend/src/server/api/endpoints/admin/relays/list.ts index 31604b16d4..a2fa2596e9 100644 --- a/packages/backend/src/server/api/endpoints/admin/relays/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/relays/list.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RelayService } from '@/core/RelayService.js'; export const meta = { @@ -52,7 +52,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts index f9c9f830d3..13f8e2d8ee 100644 --- a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts +++ b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RelayService } from '@/core/RelayService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { inbox: { type: 'string' }, }, required: ['inbox'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/reset-password.ts index f962e45d9a..e879fe8e5c 100644 --- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import bcrypt from 'bcryptjs'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository, UserProfilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; @@ -40,7 +40,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts index fcaffb2061..6d643b283b 100644 --- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts +++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AbuseUserReportsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -37,7 +37,7 @@ export const paramDef = { forward: { type: 'boolean', default: false }, }, required: ['reportId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts index 528da7c596..0036842dfb 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RolesRepository, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -54,7 +54,7 @@ export const paramDef = { 'roleId', 'userId', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/create.ts b/packages/backend/src/server/api/endpoints/admin/roles/create.ts index 686d307cf3..fe2112b264 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -59,7 +59,7 @@ export const paramDef = { 'displayOrder', 'policies', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts index 16a51a08f5..83727c7df5 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RolesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -36,7 +36,7 @@ export const paramDef = { required: [ 'roleId', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/list.ts b/packages/backend/src/server/api/endpoints/admin/roles/list.ts index 9166a79f71..e30e106b91 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RolesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -35,7 +35,7 @@ export const paramDef = { }, required: [ ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/show.ts b/packages/backend/src/server/api/endpoints/admin/roles/show.ts index 774506a087..68903fdc53 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/show.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RolesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -42,7 +42,7 @@ export const paramDef = { required: [ 'roleId', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts index 80a3b594df..84db86f0e8 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RolesRepository, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -56,7 +56,7 @@ export const paramDef = { 'roleId', 'userId', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts b/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts index a494c71f89..0a948922c1 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { MetaService } from '@/core/MetaService.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -29,7 +29,7 @@ export const paramDef = { required: [ 'policies', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update.ts b/packages/backend/src/server/api/endpoints/admin/roles/update.ts index d05b6c7978..46ef21411c 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RolesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -52,7 +52,7 @@ export const paramDef = { required: [ 'roleId', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/roles/users.ts b/packages/backend/src/server/api/endpoints/admin/roles/users.ts index f2b38d8cd8..276dc49632 100644 --- a/packages/backend/src/server/api/endpoints/admin/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/admin/roles/users.ts @@ -8,7 +8,7 @@ import { Brackets } from 'typeorm'; import type { RoleAssignmentsRepository, RolesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -54,7 +54,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: ['roleId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/send-email.ts b/packages/backend/src/server/api/endpoints/admin/send-email.ts index 947a706a20..b64c7d4205 100644 --- a/packages/backend/src/server/api/endpoints/admin/send-email.ts +++ b/packages/backend/src/server/api/endpoints/admin/send-email.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { EmailService } from '@/core/EmailService.js'; export const meta = { @@ -25,7 +25,7 @@ export const paramDef = { text: { type: 'string' }, }, required: ['to', 'subject', 'text'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/server-info.ts b/packages/backend/src/server/api/endpoints/admin/server-info.ts index 372d7e094a..a67f161c9e 100644 --- a/packages/backend/src/server/api/endpoints/admin/server-info.ts +++ b/packages/backend/src/server/api/endpoints/admin/server-info.ts @@ -10,7 +10,7 @@ import { DataSource } from 'typeorm'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -101,7 +101,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts index 95d8e1521f..4623345a8f 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ModerationLogsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -69,7 +69,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id', nullable: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts index 88fc405527..e77e2164fb 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository, SigninsRepository, UserProfilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -184,7 +184,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts index 496d8ab006..f2f22bde8e 100644 --- a/packages/backend/src/server/api/endpoints/admin/show-users.ts +++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; @@ -48,7 +48,7 @@ export const paramDef = { }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts index 8babc43b10..6b541073c8 100644 --- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository } from '@/models/_.js'; import { UserSuspendService } from '@/core/UserSuspendService.js'; import { DI } from '@/di-symbols.js'; @@ -26,7 +26,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts index 057191850d..28d92179a1 100644 --- a/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { SystemWebhookEntityService } from '@/core/entities/SystemWebhookEntityService.js'; import { systemWebhookEventTypes } from '@/models/SystemWebhook.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; @@ -61,7 +61,7 @@ export const paramDef = { 'url', 'secret', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/delete.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/delete.ts index 175659f867..b6c2637172 100644 --- a/packages/backend/src/server/api/endpoints/admin/system-webhook/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/delete.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { required: [ 'id', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts index e7f0c10b23..223a23fd21 100644 --- a/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/list.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { SystemWebhookEntityService } from '@/core/entities/SystemWebhookEntityService.js'; import { systemWebhookEventTypes } from '@/models/SystemWebhook.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; @@ -43,7 +43,7 @@ export const paramDef = { }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts index 43e976338c..e46ac01d04 100644 --- a/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts +++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/show.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { SystemWebhookEntityService } from '@/core/entities/SystemWebhookEntityService.js'; import { ApiError } from '@/server/api/error.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; @@ -44,7 +44,7 @@ export const paramDef = { }, }, required: ['id'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts index c6216938ac..951e230a7c 100644 --- a/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { SystemWebhookEntityService } from '@/core/entities/SystemWebhookEntityService.js'; import { systemWebhookEventTypes } from '@/models/SystemWebhook.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js'; @@ -66,7 +66,7 @@ export const paramDef = { 'url', 'secret', ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/unset-user-avatar.ts b/packages/backend/src/server/api/endpoints/admin/unset-user-avatar.ts index 0ad6546241..f0f199dc5f 100644 --- a/packages/backend/src/server/api/endpoints/admin/unset-user-avatar.ts +++ b/packages/backend/src/server/api/endpoints/admin/unset-user-avatar.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -25,7 +25,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // eslint-disable-next-line import/no-default-export @Injectable() diff --git a/packages/backend/src/server/api/endpoints/admin/unset-user-banner.ts b/packages/backend/src/server/api/endpoints/admin/unset-user-banner.ts index cd359e22af..1c4fb7dfec 100644 --- a/packages/backend/src/server/api/endpoints/admin/unset-user-banner.ts +++ b/packages/backend/src/server/api/endpoints/admin/unset-user-banner.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -25,7 +25,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // eslint-disable-next-line import/no-default-export @Injectable() diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts index e6a94a8e64..102f787394 100644 --- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts +++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository } from '@/models/_.js'; import { UserSuspendService } from '@/core/UserSuspendService.js'; import { DI } from '@/di-symbols.js'; @@ -25,7 +25,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 0bae985215..911c3f5bfb 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -8,7 +8,7 @@ import type { MiMeta } from '@/models/Meta.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { MetaService } from '@/core/MetaService.js'; export const meta = { @@ -171,7 +171,7 @@ export const paramDef = { urlPreviewSummaryProxyUrl: { type: 'string', nullable: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts index 8438e03167..ef5d052e87 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserProfilesRepository, UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -26,7 +26,7 @@ export const paramDef = { text: { type: 'string' }, }, required: ['userId', 'text'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts index 672fe050d0..6b761343d8 100644 --- a/packages/backend/src/server/api/endpoints/announcements.ts +++ b/packages/backend/src/server/api/endpoints/announcements.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { AnnouncementEntityService } from '@/core/entities/AnnouncementEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { isActive: { type: 'boolean', default: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/announcements/show.ts b/packages/backend/src/server/api/endpoints/announcements/show.ts index dfc1510410..c51d31da4f 100644 --- a/packages/backend/src/server/api/endpoints/announcements/show.ts +++ b/packages/backend/src/server/api/endpoints/announcements/show.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { EntityNotFoundError } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; import { ApiError } from '../../error.js'; @@ -37,7 +37,7 @@ export const paramDef = { announcementId: { type: 'string', format: 'misskey:id' }, }, required: ['announcementId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts index 44229fd7e9..f585f6630a 100644 --- a/packages/backend/src/server/api/endpoints/antennas/create.ts +++ b/packages/backend/src/server/api/endpoints/antennas/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { IdService } from '@/core/IdService.js'; import type { UserListsRepository, AntennasRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -71,7 +71,7 @@ export const paramDef = { withFile: { type: 'boolean' }, }, required: ['name', 'src', 'keywords', 'excludeKeywords', 'users', 'caseSensitive', 'withReplies', 'withFile'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/antennas/delete.ts b/packages/backend/src/server/api/endpoints/antennas/delete.ts index ebb3002af2..6eafaa79e9 100644 --- a/packages/backend/src/server/api/endpoints/antennas/delete.ts +++ b/packages/backend/src/server/api/endpoints/antennas/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AntennasRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -34,7 +34,7 @@ export const paramDef = { antennaId: { type: 'string', format: 'misskey:id' }, }, required: ['antennaId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/antennas/list.ts b/packages/backend/src/server/api/endpoints/antennas/list.ts index dfe7c0b4b9..15fd4f8554 100644 --- a/packages/backend/src/server/api/endpoints/antennas/list.ts +++ b/packages/backend/src/server/api/endpoints/antennas/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AntennasRepository } from '@/models/_.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -33,7 +33,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index aea140806e..ba649a5b55 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { NotesRepository, AntennasRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteReadService } from '@/core/NoteReadService.js'; @@ -56,7 +56,7 @@ export const paramDef = { untilDate: { type: 'integer' }, }, required: ['antennaId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/antennas/show.ts b/packages/backend/src/server/api/endpoints/antennas/show.ts index 9c2aacfef9..2ba21e32c6 100644 --- a/packages/backend/src/server/api/endpoints/antennas/show.ts +++ b/packages/backend/src/server/api/endpoints/antennas/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AntennasRepository } from '@/models/_.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { antennaId: { type: 'string', format: 'misskey:id' }, }, required: ['antennaId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts index b41ee423d4..a8376bffd9 100644 --- a/packages/backend/src/server/api/endpoints/antennas/update.ts +++ b/packages/backend/src/server/api/endpoints/antennas/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AntennasRepository, UserListsRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { AntennaEntityService } from '@/core/entities/AntennaEntityService.js'; @@ -70,7 +70,7 @@ export const paramDef = { withFile: { type: 'boolean' }, }, required: ['antennaId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/ap/get.ts b/packages/backend/src/server/api/endpoints/ap/get.ts index 38c795b361..be30b7e8d1 100644 --- a/packages/backend/src/server/api/endpoints/ap/get.ts +++ b/packages/backend/src/server/api/endpoints/ap/get.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ApResolverService } from '@/core/activitypub/ApResolverService.js'; export const meta = { @@ -36,7 +36,7 @@ export const paramDef = { uri: { type: 'string' }, }, required: ['uri'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts index f2edb14222..ff5ffb3bb4 100644 --- a/packages/backend/src/server/api/endpoints/ap/show.ts +++ b/packages/backend/src/server/api/endpoints/ap/show.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { MiNote } from '@/models/Note.js'; import type { MiLocalUser, MiUser } from '@/models/User.js'; import { isActor, isPost, getApId } from '@/core/activitypub/type.js'; @@ -85,7 +85,7 @@ export const paramDef = { uri: { type: 'string' }, }, required: ['uri'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts index 7ace305e25..30729bc723 100644 --- a/packages/backend/src/server/api/endpoints/app/create.ts +++ b/packages/backend/src/server/api/endpoints/app/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema, ValidatableSchema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AppsRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { unique } from '@/misc/prelude/array.js'; diff --git a/packages/backend/src/server/api/endpoints/app/show.ts b/packages/backend/src/server/api/endpoints/app/show.ts index 7365b5d85e..f76fd7a108 100644 --- a/packages/backend/src/server/api/endpoints/app/show.ts +++ b/packages/backend/src/server/api/endpoints/app/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AppsRepository } from '@/models/_.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { appId: { type: 'string', format: 'misskey:id' }, }, required: ['appId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts index 808d8677ce..de55265270 100644 --- a/packages/backend/src/server/api/endpoints/auth/accept.ts +++ b/packages/backend/src/server/api/endpoints/auth/accept.ts @@ -7,7 +7,7 @@ import * as crypto from 'node:crypto'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AuthSessionsRepository, AppsRepository, AccessTokensRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; @@ -36,7 +36,7 @@ export const paramDef = { token: { type: 'string' }, }, required: ['token'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts index c36dd074ad..c25ca9a7c7 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts @@ -7,7 +7,7 @@ import { randomUUID } from 'node:crypto'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AppsRepository, AuthSessionsRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import type { Config } from '@/config.js'; @@ -50,7 +50,7 @@ export const paramDef = { appSecret: { type: 'string' }, }, required: ['appSecret'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/auth/session/show.ts b/packages/backend/src/server/api/endpoints/auth/session/show.ts index 9aa093a7a2..19f7cd4b05 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/show.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AuthSessionsRepository } from '@/models/_.js'; import { AuthSessionEntityService } from '@/core/entities/AuthSessionEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -53,7 +53,7 @@ export const paramDef = { token: { type: 'string' }, }, required: ['token'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts index 81e00a0fa4..704bff5e24 100644 --- a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts +++ b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AppsRepository, AccessTokensRepository, AuthSessionsRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -62,7 +62,7 @@ export const paramDef = { token: { type: 'string' }, }, required: ['appSecret', 'token'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts index 20afeed526..9c961d4bbe 100644 --- a/packages/backend/src/server/api/endpoints/blocking/create.ts +++ b/packages/backend/src/server/api/endpoints/blocking/create.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository, BlockingsRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; @@ -60,7 +60,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts index a5d02c8477..71f168841a 100644 --- a/packages/backend/src/server/api/endpoints/blocking/delete.ts +++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository, BlockingsRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; @@ -60,7 +60,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts index 7eb151ff18..46d2ec2c03 100644 --- a/packages/backend/src/server/api/endpoints/blocking/list.ts +++ b/packages/backend/src/server/api/endpoints/blocking/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { BlockingsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { BlockingEntityService } from '@/core/entities/BlockingEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts index fcc01a35db..b5a5bea1ef 100644 --- a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts +++ b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { BubbleGameRecordsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -50,7 +50,7 @@ export const paramDef = { gameMode: { type: 'string' }, }, required: ['gameMode'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/bubble-game/register.ts b/packages/backend/src/server/api/endpoints/bubble-game/register.ts index a980b67995..301b8f5532 100644 --- a/packages/backend/src/server/api/endpoints/bubble-game/register.ts +++ b/packages/backend/src/server/api/endpoints/bubble-game/register.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { IdService } from '@/core/IdService.js'; import type { BubbleGameRecordsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -51,7 +51,7 @@ export const paramDef = { gameVersion: { type: 'integer' }, }, required: ['score', 'seed', 'logs', 'gameMode', 'gameVersion'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts index f0ee9862f3..4d9d59df7c 100644 --- a/packages/backend/src/server/api/endpoints/channels/create.ts +++ b/packages/backend/src/server/api/endpoints/channels/create.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelsRepository, DriveFilesRepository } from '@/models/_.js'; import type { MiChannel } from '@/models/Channel.js'; import { IdService } from '@/core/IdService.js'; @@ -55,7 +55,7 @@ export const paramDef = { allowRenoteToExternal: { type: 'boolean', nullable: true }, }, required: ['name'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/favorite.ts b/packages/backend/src/server/api/endpoints/channels/favorite.ts index d21f155120..e7e0d30cf9 100644 --- a/packages/backend/src/server/api/endpoints/channels/favorite.ts +++ b/packages/backend/src/server/api/endpoints/channels/favorite.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelFavoritesRepository, ChannelsRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { channelId: { type: 'string', format: 'misskey:id' }, }, required: ['channelId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts index 8ec6b5a42a..5643b525ef 100644 --- a/packages/backend/src/server/api/endpoints/channels/featured.ts +++ b/packages/backend/src/server/api/endpoints/channels/featured.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelsRepository } from '@/models/_.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts index ee33f79a6f..ecd028a9f1 100644 --- a/packages/backend/src/server/api/endpoints/channels/follow.ts +++ b/packages/backend/src/server/api/endpoints/channels/follow.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ChannelFollowingService } from '@/core/ChannelFollowingService.js'; @@ -36,7 +36,7 @@ export const paramDef = { channelId: { type: 'string', format: 'misskey:id' }, }, required: ['channelId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts index 6e970bad2b..b2aaa5f5e1 100644 --- a/packages/backend/src/server/api/endpoints/channels/followed.ts +++ b/packages/backend/src/server/api/endpoints/channels/followed.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelFollowingsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 5 }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts index 12de99f8d9..e84a7c40d2 100644 --- a/packages/backend/src/server/api/endpoints/channels/my-favorites.ts +++ b/packages/backend/src/server/api/endpoints/channels/my-favorites.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelFavoritesRepository } from '@/models/_.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -34,7 +34,7 @@ export const paramDef = { properties: { }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/owned.ts b/packages/backend/src/server/api/endpoints/channels/owned.ts index 88eef61c89..5a88c85388 100644 --- a/packages/backend/src/server/api/endpoints/channels/owned.ts +++ b/packages/backend/src/server/api/endpoints/channels/owned.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 5 }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/search.ts b/packages/backend/src/server/api/endpoints/channels/search.ts index 062d4d5565..c15ec5e85f 100644 --- a/packages/backend/src/server/api/endpoints/channels/search.ts +++ b/packages/backend/src/server/api/endpoints/channels/search.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import type { ChannelsRepository } from '@/models/_.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; @@ -40,7 +40,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 5 }, }, required: ['query'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/show.ts b/packages/backend/src/server/api/endpoints/channels/show.ts index 8c049c92b6..192af48a3c 100644 --- a/packages/backend/src/server/api/endpoints/channels/show.ts +++ b/packages/backend/src/server/api/endpoints/channels/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelsRepository } from '@/models/_.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { channelId: { type: 'string', format: 'misskey:id' }, }, required: ['channelId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts index 85c16927e5..e32d5baa87 100644 --- a/packages/backend/src/server/api/endpoints/channels/timeline.ts +++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelsRepository, NotesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -55,7 +55,7 @@ export const paramDef = { allowPartial: { type: 'boolean', default: false }, // true is recommended but for compatibility false by default }, required: ['channelId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/unfavorite.ts b/packages/backend/src/server/api/endpoints/channels/unfavorite.ts index 0d9f33fa43..d5e10a9420 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfavorite.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelFavoritesRepository, ChannelsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -35,7 +35,7 @@ export const paramDef = { channelId: { type: 'string', format: 'misskey:id' }, }, required: ['channelId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts index 3f2758f233..5d68dabdc2 100644 --- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts +++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ChannelsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ChannelFollowingService } from '@/core/ChannelFollowingService.js'; @@ -36,7 +36,7 @@ export const paramDef = { channelId: { type: 'string', format: 'misskey:id' }, }, required: ['channelId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts index 7d5a87204f..7ec7beb6c8 100644 --- a/packages/backend/src/server/api/endpoints/channels/update.ts +++ b/packages/backend/src/server/api/endpoints/channels/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository, ChannelsRepository } from '@/models/_.js'; import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -66,7 +66,7 @@ export const paramDef = { allowRenoteToExternal: { type: 'boolean', nullable: true }, }, required: ['channelId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/active-users.ts b/packages/backend/src/server/api/endpoints/charts/active-users.ts index 5c9f537dda..e63184e409 100644 --- a/packages/backend/src/server/api/endpoints/charts/active-users.ts +++ b/packages/backend/src/server/api/endpoints/charts/active-users.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; import { schema } from '@/core/chart/charts/entities/active-users.js'; @@ -28,7 +28,7 @@ export const paramDef = { offset: { type: 'integer', nullable: true, default: null }, }, required: ['span'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/ap-request.ts b/packages/backend/src/server/api/endpoints/charts/ap-request.ts index c08fcbf2d8..81fb37ca40 100644 --- a/packages/backend/src/server/api/endpoints/charts/ap-request.ts +++ b/packages/backend/src/server/api/endpoints/charts/ap-request.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import ApRequestChart from '@/core/chart/charts/ap-request.js'; import { schema } from '@/core/chart/charts/entities/ap-request.js'; @@ -28,7 +28,7 @@ export const paramDef = { offset: { type: 'integer', nullable: true, default: null }, }, required: ['span'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/drive.ts b/packages/backend/src/server/api/endpoints/charts/drive.ts index 597ea3f57d..c0c0446b7a 100644 --- a/packages/backend/src/server/api/endpoints/charts/drive.ts +++ b/packages/backend/src/server/api/endpoints/charts/drive.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import DriveChart from '@/core/chart/charts/drive.js'; import { schema } from '@/core/chart/charts/entities/drive.js'; @@ -28,7 +28,7 @@ export const paramDef = { offset: { type: 'integer', nullable: true, default: null }, }, required: ['span'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/federation.ts b/packages/backend/src/server/api/endpoints/charts/federation.ts index 6579804ba2..2254753688 100644 --- a/packages/backend/src/server/api/endpoints/charts/federation.ts +++ b/packages/backend/src/server/api/endpoints/charts/federation.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import FederationChart from '@/core/chart/charts/federation.js'; import { schema } from '@/core/chart/charts/entities/federation.js'; @@ -28,7 +28,7 @@ export const paramDef = { offset: { type: 'integer', nullable: true, default: null }, }, required: ['span'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/instance.ts b/packages/backend/src/server/api/endpoints/charts/instance.ts index f9f69c4797..d4689d278c 100644 --- a/packages/backend/src/server/api/endpoints/charts/instance.ts +++ b/packages/backend/src/server/api/endpoints/charts/instance.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import InstanceChart from '@/core/chart/charts/instance.js'; import { schema } from '@/core/chart/charts/entities/instance.js'; @@ -29,7 +29,7 @@ export const paramDef = { host: { type: 'string' }, }, required: ['span', 'host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/notes.ts b/packages/backend/src/server/api/endpoints/charts/notes.ts index b33b4b42b0..7507c1e5eb 100644 --- a/packages/backend/src/server/api/endpoints/charts/notes.ts +++ b/packages/backend/src/server/api/endpoints/charts/notes.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import NotesChart from '@/core/chart/charts/notes.js'; import { schema } from '@/core/chart/charts/entities/notes.js'; @@ -28,7 +28,7 @@ export const paramDef = { offset: { type: 'integer', nullable: true, default: null }, }, required: ['span'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/user/drive.ts b/packages/backend/src/server/api/endpoints/charts/user/drive.ts index efea13bd21..532b5d08a1 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/drive.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/drive.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import PerUserDriveChart from '@/core/chart/charts/per-user-drive.js'; import { schema } from '@/core/chart/charts/entities/per-user-drive.js'; @@ -29,7 +29,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['span', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/user/following.ts b/packages/backend/src/server/api/endpoints/charts/user/following.ts index d55e25359e..7e2b190c7d 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/following.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/following.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { getJsonSchema } from '@/core/chart/core.js'; import PerUserFollowingChart from '@/core/chart/charts/per-user-following.js'; import { schema } from '@/core/chart/charts/entities/per-user-following.js'; @@ -29,7 +29,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['span', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/user/notes.ts b/packages/backend/src/server/api/endpoints/charts/user/notes.ts index 2dfeda3f3b..c2f541fd9c 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/notes.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/notes.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import PerUserNotesChart from '@/core/chart/charts/per-user-notes.js'; import { schema } from '@/core/chart/charts/entities/per-user-notes.js'; @@ -29,7 +29,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['span', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/user/pv.ts b/packages/backend/src/server/api/endpoints/charts/user/pv.ts index be4debe289..4cb696e0e2 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/pv.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/pv.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import PerUserPvChart from '@/core/chart/charts/per-user-pv.js'; import { schema } from '@/core/chart/charts/entities/per-user-pv.js'; @@ -29,7 +29,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['span', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/user/reactions.ts b/packages/backend/src/server/api/endpoints/charts/user/reactions.ts index fa75caf0e2..54bddc73f5 100644 --- a/packages/backend/src/server/api/endpoints/charts/user/reactions.ts +++ b/packages/backend/src/server/api/endpoints/charts/user/reactions.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import PerUserReactionsChart from '@/core/chart/charts/per-user-reactions.js'; import { schema } from '@/core/chart/charts/entities/per-user-reactions.js'; @@ -29,7 +29,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['span', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/charts/users.ts b/packages/backend/src/server/api/endpoints/charts/users.ts index cfe42f4bc7..7102ba750e 100644 --- a/packages/backend/src/server/api/endpoints/charts/users.ts +++ b/packages/backend/src/server/api/endpoints/charts/users.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import { getJsonSchema } from '@/core/chart/core.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import UsersChart from '@/core/chart/charts/users.js'; import { schema } from '@/core/chart/charts/entities/users.js'; @@ -28,7 +28,7 @@ export const paramDef = { offset: { type: 'integer', nullable: true, default: null }, }, required: ['span'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/add-note.ts b/packages/backend/src/server/api/endpoints/clips/add-note.ts index b3e6f19f6c..fde4eb8d13 100644 --- a/packages/backend/src/server/api/endpoints/clips/add-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ClipService } from '@/core/ClipService.js'; import { ApiError } from '../../error.js'; @@ -59,7 +59,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['clipId', 'noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/create.ts b/packages/backend/src/server/api/endpoints/clips/create.ts index aa1f2d409e..2f0c7e7322 100644 --- a/packages/backend/src/server/api/endpoints/clips/create.ts +++ b/packages/backend/src/server/api/endpoints/clips/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { MiClip } from '@/models/_.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { ApiError } from '@/server/api/error.js'; @@ -44,7 +44,7 @@ export const paramDef = { description: { type: 'string', nullable: true, minLength: 1, maxLength: 2048 }, }, required: ['name'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/delete.ts b/packages/backend/src/server/api/endpoints/clips/delete.ts index f51ef5df08..079276ca76 100644 --- a/packages/backend/src/server/api/endpoints/clips/delete.ts +++ b/packages/backend/src/server/api/endpoints/clips/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ClipService } from '@/core/ClipService.js'; import { ApiError } from '../../error.js'; @@ -32,7 +32,7 @@ export const paramDef = { clipId: { type: 'string', format: 'misskey:id' }, }, required: ['clipId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/favorite.ts b/packages/backend/src/server/api/endpoints/clips/favorite.ts index e9d78c3fcd..b9491d8d0f 100644 --- a/packages/backend/src/server/api/endpoints/clips/favorite.ts +++ b/packages/backend/src/server/api/endpoints/clips/favorite.ts @@ -8,7 +8,7 @@ import type { ClipsRepository, ClipFavoritesRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -42,7 +42,7 @@ export const paramDef = { clipId: { type: 'string', format: 'misskey:id' }, }, required: ['clipId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/list.ts b/packages/backend/src/server/api/endpoints/clips/list.ts index a436f684f2..1717eccacf 100644 --- a/packages/backend/src/server/api/endpoints/clips/list.ts +++ b/packages/backend/src/server/api/endpoints/clips/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ClipsRepository } from '@/models/_.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -33,7 +33,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts index 4b050e54c0..a36d9eabc6 100644 --- a/packages/backend/src/server/api/endpoints/clips/my-favorites.ts +++ b/packages/backend/src/server/api/endpoints/clips/my-favorites.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ClipFavoritesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; @@ -34,7 +34,7 @@ export const paramDef = { properties: { }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts index 205d27731a..4b06b890d3 100644 --- a/packages/backend/src/server/api/endpoints/clips/notes.ts +++ b/packages/backend/src/server/api/endpoints/clips/notes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { NotesRepository, ClipsRepository, ClipNotesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -48,7 +48,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['clipId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/remove-note.ts b/packages/backend/src/server/api/endpoints/clips/remove-note.ts index 5e5d1f95c5..d799fa5267 100644 --- a/packages/backend/src/server/api/endpoints/clips/remove-note.ts +++ b/packages/backend/src/server/api/endpoints/clips/remove-note.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ClipService } from '@/core/ClipService.js'; import { ApiError } from '../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['clipId', 'noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/show.ts b/packages/backend/src/server/api/endpoints/clips/show.ts index 8fbc88475d..2038d4c18e 100644 --- a/packages/backend/src/server/api/endpoints/clips/show.ts +++ b/packages/backend/src/server/api/endpoints/clips/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { ClipsRepository } from '@/models/_.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { clipId: { type: 'string', format: 'misskey:id' }, }, required: ['clipId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/unfavorite.ts b/packages/backend/src/server/api/endpoints/clips/unfavorite.ts index bdb1f1cef5..efae2e3199 100644 --- a/packages/backend/src/server/api/endpoints/clips/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/clips/unfavorite.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { ClipsRepository, ClipFavoritesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { clipId: { type: 'string', format: 'misskey:id' }, }, required: ['clipId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/clips/update.ts b/packages/backend/src/server/api/endpoints/clips/update.ts index 5952086808..f4d6bf89c0 100644 --- a/packages/backend/src/server/api/endpoints/clips/update.ts +++ b/packages/backend/src/server/api/endpoints/clips/update.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { ClipService } from '@/core/ClipService.js'; import { ApiError } from '../../error.js'; @@ -44,7 +44,7 @@ export const paramDef = { description: { type: 'string', nullable: true, minLength: 1, maxLength: 2048 }, }, required: ['clipId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive.ts b/packages/backend/src/server/api/endpoints/drive.ts index a668354543..40d55e2723 100644 --- a/packages/backend/src/server/api/endpoints/drive.ts +++ b/packages/backend/src/server/api/endpoints/drive.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { MetaService } from '@/core/MetaService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -38,7 +38,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts index 57cdf9cb6a..f6b2abdc63 100644 --- a/packages/backend/src/server/api/endpoints/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/drive/files.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; @@ -41,7 +41,7 @@ export const paramDef = { sort: { type: 'string', nullable: true, enum: ['+createdAt', '-createdAt', '+name', '-name', '+size', '-size', null] }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts index baf901cdb6..7e10754c7f 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { NotesRepository, DriveFilesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -50,7 +50,7 @@ export const paramDef = { fileId: { type: 'string', format: 'misskey:id' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts index 27e53037fd..de652d6b54 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { md5: { type: 'string' }, }, required: ['md5'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export 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 fbf92f8f9f..19285dfcc4 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/create.ts @@ -9,7 +9,7 @@ import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/const.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { MetaService } from '@/core/MetaService.js'; import { DriveService } from '@/core/DriveService.js'; @@ -70,7 +70,7 @@ export const paramDef = { force: { type: 'boolean', default: false }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/delete.ts b/packages/backend/src/server/api/endpoints/drive/files/delete.ts index cc401bda01..02b34d6d54 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DriveService } from '@/core/DriveService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -44,7 +44,7 @@ export const paramDef = { fileId: { type: 'string', format: 'misskey:id' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts index 8126953ce3..f96d77ed83 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { DriveFilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { md5: { type: 'string' }, }, required: ['md5'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/find.ts b/packages/backend/src/server/api/endpoints/drive/files/find.ts index d476abfee2..2e242c3cb7 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/find.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { folderId: { type: 'string', format: 'misskey:id', nullable: true, default: null }, }, required: ['name'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/show.ts b/packages/backend/src/server/api/endpoints/drive/files/show.ts index be01259eb9..b2a47ad6f2 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/show.ts @@ -8,7 +8,7 @@ import type { MiDriveFile } from '@/models/DriveFile.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; @@ -54,7 +54,7 @@ export const paramDef = { { required: ['fileId'] }, { required: ['url'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts index 4b979ce693..7662b715c7 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { DriveFilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { RoleService } from '@/core/RoleService.js'; import { DriveService } from '@/core/DriveService.js'; @@ -70,7 +70,7 @@ export const paramDef = { comment: { type: 'string', nullable: true, maxLength: 512 }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts index c6ada3167c..3330667a2f 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { DriveService } from '@/core/DriveService.js'; @@ -40,7 +40,7 @@ export const paramDef = { force: { type: 'boolean', default: false }, }, required: ['url'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts index 6ef673c83f..232246c12e 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFoldersRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; @@ -39,7 +39,7 @@ export const paramDef = { folderId: { type: 'string', format: 'misskey:id', nullable: true, default: null }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts index 80fc0b481d..98e1e65384 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFoldersRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; @@ -49,7 +49,7 @@ export const paramDef = { parentId: { type: 'string', format: 'misskey:id', nullable: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts index 2223e9c33d..89a2472b8d 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFoldersRepository, DriveFilesRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { folderId: { type: 'string', format: 'misskey:id' }, }, required: ['folderId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/folders/find.ts b/packages/backend/src/server/api/endpoints/drive/folders/find.ts index 31432deb7b..3b93838e3e 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFoldersRepository } from '@/models/_.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { parentId: { type: 'string', format: 'misskey:id', nullable: true, default: null }, }, required: ['name'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/folders/show.ts b/packages/backend/src/server/api/endpoints/drive/folders/show.ts index 247cf8e5c6..185a174fdd 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/show.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFoldersRepository } from '@/models/_.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { folderId: { type: 'string', format: 'misskey:id' }, }, required: ['folderId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts index efb034a8fa..460aabfb87 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFoldersRepository } from '@/models/_.js'; import { DriveFolderEntityService } from '@/core/entities/DriveFolderEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -55,7 +55,7 @@ export const paramDef = { parentId: { type: 'string', format: 'misskey:id', nullable: true }, }, required: ['folderId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/drive/stream.ts b/packages/backend/src/server/api/endpoints/drive/stream.ts index 44eb6403b4..fdd7234ce2 100644 --- a/packages/backend/src/server/api/endpoints/drive/stream.ts +++ b/packages/backend/src/server/api/endpoints/drive/stream.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; @@ -39,7 +39,7 @@ export const paramDef = { type: { type: 'string', pattern: /^[a-zA-Z\/\-*]+$/.toString().slice(1, -1) }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/email-address/available.ts b/packages/backend/src/server/api/endpoints/email-address/available.ts index 7209cd813f..ae03ea2d4b 100644 --- a/packages/backend/src/server/api/endpoints/email-address/available.ts +++ b/packages/backend/src/server/api/endpoints/email-address/available.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { EmailService } from '@/core/EmailService.js'; export const meta = { @@ -36,7 +36,7 @@ export const paramDef = { emailAddress: { type: 'string' }, }, required: ['emailAddress'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/emoji.ts b/packages/backend/src/server/api/endpoints/emoji.ts index aacc603e72..4d88ea0aa7 100644 --- a/packages/backend/src/server/api/endpoints/emoji.ts +++ b/packages/backend/src/server/api/endpoints/emoji.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { EmojisRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -34,7 +34,7 @@ export const paramDef = { }, }, required: ['name'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts index f34a81b5e7..30341d6d01 100644 --- a/packages/backend/src/server/api/endpoints/emojis.ts +++ b/packages/backend/src/server/api/endpoints/emojis.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { EmojisRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -41,7 +41,7 @@ export const paramDef = { properties: { }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/endpoint.ts b/packages/backend/src/server/api/endpoints/endpoint.ts index a51d10dfb2..e226def33c 100644 --- a/packages/backend/src/server/api/endpoints/endpoint.ts +++ b/packages/backend/src/server/api/endpoints/endpoint.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import endpoints from '../endpoints.js'; export const meta = { @@ -38,7 +38,7 @@ export const paramDef = { endpoint: { type: 'string' }, }, required: ['endpoint'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/endpoints.ts b/packages/backend/src/server/api/endpoints/endpoints.ts index 9faaaf8a89..67fdcb77bc 100644 --- a/packages/backend/src/server/api/endpoints/endpoints.ts +++ b/packages/backend/src/server/api/endpoints/endpoints.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import endpoints from '../endpoints.js'; export const meta = { @@ -34,7 +34,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts index 8c31bbe739..211271305f 100644 --- a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts +++ b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts index b82075d71f..69031a8364 100644 --- a/packages/backend/src/server/api/endpoints/federation/followers.ts +++ b/packages/backend/src/server/api/endpoints/federation/followers.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; @@ -37,7 +37,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts index 23e44b96de..27b5e900f8 100644 --- a/packages/backend/src/server/api/endpoints/federation/following.ts +++ b/packages/backend/src/server/api/endpoints/federation/following.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; @@ -37,7 +37,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts index 8c4ef9189e..cfe69a5c75 100644 --- a/packages/backend/src/server/api/endpoints/federation/instances.ts +++ b/packages/backend/src/server/api/endpoints/federation/instances.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { InstancesRepository } from '@/models/_.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; import { MetaService } from '@/core/MetaService.js'; @@ -67,7 +67,7 @@ export const paramDef = { }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts index 0614353936..b87e98f285 100644 --- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts +++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { InstancesRepository } from '@/models/_.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; import { UtilityService } from '@/core/UtilityService.js'; @@ -30,7 +30,7 @@ export const paramDef = { host: { type: 'string' }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts index 5bdd9d0ac3..040dc74cee 100644 --- a/packages/backend/src/server/api/endpoints/federation/stats.ts +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -9,7 +9,7 @@ import type { FollowingsRepository, InstancesRepository } from '@/models/_.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -60,7 +60,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts index a397adeac0..49453e0256 100644 --- a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts +++ b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -22,7 +22,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts index 55131cc4e4..5ff80a234a 100644 --- a/packages/backend/src/server/api/endpoints/federation/users.ts +++ b/packages/backend/src/server/api/endpoints/federation/users.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -37,7 +37,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: ['host'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/fetch-external-resources.ts b/packages/backend/src/server/api/endpoints/fetch-external-resources.ts index 3fd17ef7d7..3cd60ddc5d 100644 --- a/packages/backend/src/server/api/endpoints/fetch-external-resources.ts +++ b/packages/backend/src/server/api/endpoints/fetch-external-resources.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { ApiError } from '../error.js'; @@ -56,7 +56,7 @@ export const paramDef = { hash: { type: 'string' }, }, required: ['url', 'hash'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/fetch-rss.ts b/packages/backend/src/server/api/endpoints/fetch-rss.ts index 7ffc18c4a5..d5605640e7 100644 --- a/packages/backend/src/server/api/endpoints/fetch-rss.ts +++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts @@ -7,7 +7,7 @@ import Parser from 'rss-parser'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; const rssParser = new Parser(); @@ -213,7 +213,7 @@ export const paramDef = { url: { type: 'string' }, }, required: ['url'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/create.ts b/packages/backend/src/server/api/endpoints/flash/create.ts index 9d2c85e949..a749f35bad 100644 --- a/packages/backend/src/server/api/endpoints/flash/create.ts +++ b/packages/backend/src/server/api/endpoints/flash/create.ts @@ -9,7 +9,7 @@ import type { FlashsRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; @@ -49,7 +49,7 @@ export const paramDef = { visibility: { type: 'string', enum: ['public', 'private'], default: 'public' }, }, required: ['title', 'summary', 'script', 'permissions'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/delete.ts b/packages/backend/src/server/api/endpoints/flash/delete.ts index bc85971822..732db4579b 100644 --- a/packages/backend/src/server/api/endpoints/flash/delete.ts +++ b/packages/backend/src/server/api/endpoints/flash/delete.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { FlashsRepository, UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -41,7 +41,7 @@ export const paramDef = { flashId: { type: 'string', format: 'misskey:id' }, }, required: ['flashId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/featured.ts b/packages/backend/src/server/api/endpoints/flash/featured.ts index ff13b376ee..445e351cdc 100644 --- a/packages/backend/src/server/api/endpoints/flash/featured.ts +++ b/packages/backend/src/server/api/endpoints/flash/featured.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { FlashsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/like.ts b/packages/backend/src/server/api/endpoints/flash/like.ts index 92ee068297..80d6a804ad 100644 --- a/packages/backend/src/server/api/endpoints/flash/like.ts +++ b/packages/backend/src/server/api/endpoints/flash/like.ts @@ -8,7 +8,7 @@ import type { FlashsRepository, FlashLikesRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -48,7 +48,7 @@ export const paramDef = { flashId: { type: 'string', format: 'misskey:id' }, }, required: ['flashId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/my-likes.ts b/packages/backend/src/server/api/endpoints/flash/my-likes.ts index d96230b388..a1339fa255 100644 --- a/packages/backend/src/server/api/endpoints/flash/my-likes.ts +++ b/packages/backend/src/server/api/endpoints/flash/my-likes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FlashLikesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { FlashLikeEntityService } from '@/core/entities/FlashLikeEntityService.js'; @@ -48,7 +48,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/my.ts b/packages/backend/src/server/api/endpoints/flash/my.ts index 6cd45f7e0f..c2c8ff7e80 100644 --- a/packages/backend/src/server/api/endpoints/flash/my.ts +++ b/packages/backend/src/server/api/endpoints/flash/my.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FlashsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/show.ts b/packages/backend/src/server/api/endpoints/flash/show.ts index d3dec140c0..eada6c2119 100644 --- a/packages/backend/src/server/api/endpoints/flash/show.ts +++ b/packages/backend/src/server/api/endpoints/flash/show.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { FlashsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { flashId: { type: 'string', format: 'misskey:id' }, }, required: ['flashId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/unlike.ts b/packages/backend/src/server/api/endpoints/flash/unlike.ts index 8b5cfe8f20..153122646f 100644 --- a/packages/backend/src/server/api/endpoints/flash/unlike.ts +++ b/packages/backend/src/server/api/endpoints/flash/unlike.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { FlashsRepository, FlashLikesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { flashId: { type: 'string', format: 'misskey:id' }, }, required: ['flashId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/flash/update.ts b/packages/backend/src/server/api/endpoints/flash/update.ts index 7defde3017..0063576a9e 100644 --- a/packages/backend/src/server/api/endpoints/flash/update.ts +++ b/packages/backend/src/server/api/endpoints/flash/update.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { FlashsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -54,7 +54,7 @@ export const paramDef = { visibility: { type: 'string', enum: ['public', 'private'] }, }, required: ['flashId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts index b42c79efc8..fe465c1a06 100644 --- a/packages/backend/src/server/api/endpoints/following/create.ts +++ b/packages/backend/src/server/api/endpoints/following/create.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository } from '@/models/_.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -76,7 +76,7 @@ export const paramDef = { withReplies: { type: 'boolean' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts index 64ed4da284..09a7b18bea 100644 --- a/packages/backend/src/server/api/endpoints/following/delete.ts +++ b/packages/backend/src/server/api/endpoints/following/delete.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; @@ -60,7 +60,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts index c12c17d0e2..10192d8546 100644 --- a/packages/backend/src/server/api/endpoints/following/invalidate.ts +++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; @@ -60,7 +60,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/requests/accept.ts b/packages/backend/src/server/api/endpoints/following/requests/accept.ts index 1ee5f2641e..db43fb50be 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/accept.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/accept.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; import { ApiError } from '../../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/requests/cancel.ts b/packages/backend/src/server/api/endpoints/following/requests/cancel.ts index 02931af0ad..76fc3be5e5 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/cancel.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/cancel.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { IdentifiableError } from '@/misc/identifiable-error.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -47,7 +47,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/requests/list.ts b/packages/backend/src/server/api/endpoints/following/requests/list.ts index 930ae23417..789f7cc0a8 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/list.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import type { FollowRequestsRepository } from '@/models/_.js'; import { FollowRequestEntityService } from '@/core/entities/FollowRequestEntityService.js'; @@ -54,7 +54,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/requests/reject.ts b/packages/backend/src/server/api/endpoints/following/requests/reject.ts index f0d6d6bc45..a2eed7dbe9 100644 --- a/packages/backend/src/server/api/endpoints/following/requests/reject.ts +++ b/packages/backend/src/server/api/endpoints/following/requests/reject.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; import { ApiError } from '../../../error.js'; @@ -33,7 +33,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/update-all.ts b/packages/backend/src/server/api/endpoints/following/update-all.ts index fbefdc35d5..c3f76225fb 100644 --- a/packages/backend/src/server/api/endpoints/following/update-all.ts +++ b/packages/backend/src/server/api/endpoints/following/update-all.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; @@ -34,7 +34,7 @@ export const paramDef = { notify: { type: 'string', enum: ['normal', 'none'] }, withReplies: { type: 'boolean' }, }, -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/following/update.ts b/packages/backend/src/server/api/endpoints/following/update.ts index 00d8b1db37..7c53638d47 100644 --- a/packages/backend/src/server/api/endpoints/following/update.ts +++ b/packages/backend/src/server/api/endpoints/following/update.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { FollowingsRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; @@ -62,7 +62,7 @@ export const paramDef = { withReplies: { type: 'boolean' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts index dda93b4463..f000a9fa86 100644 --- a/packages/backend/src/server/api/endpoints/gallery/featured.ts +++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository } from '@/models/_.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -35,7 +35,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts index 66863801b5..0d9937e165 100644 --- a/packages/backend/src/server/api/endpoints/gallery/popular.ts +++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository } from '@/models/_.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts index 4a8d35d657..a1d17a65a3 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; @@ -34,7 +34,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts index e99e42f392..2710007245 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/_.js'; import { MiGalleryPost } from '@/models/GalleryPost.js'; import type { MiDriveFile } from '@/models/DriveFile.js'; @@ -51,7 +51,7 @@ export const paramDef = { isSensitive: { type: 'boolean', default: false }, }, required: ['title', 'fileIds'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts index 95882799d0..62b648c9ba 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; @@ -41,7 +41,7 @@ export const paramDef = { postId: { type: 'string', format: 'misskey:id' }, }, required: ['postId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts index b2fbeebb89..29a2ca7998 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/_.js'; import { FeaturedService, GALLERY_POSTS_RANKING_WINDOW } from '@/core/FeaturedService.js'; import { IdService } from '@/core/IdService.js'; @@ -49,7 +49,7 @@ export const paramDef = { postId: { type: 'string', format: 'misskey:id' }, }, required: ['postId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts index 2ffc6e1e86..9314564447 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository } from '@/models/_.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { postId: { type: 'string', format: 'misskey:id' }, }, required: ['postId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts index 6371640e01..810e27f1fd 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository, GalleryLikesRepository } from '@/models/_.js'; import { FeaturedService, GALLERY_POSTS_RANKING_WINDOW } from '@/core/FeaturedService.js'; import { IdService } from '@/core/IdService.js'; @@ -43,7 +43,7 @@ export const paramDef = { postId: { type: 'string', format: 'misskey:id' }, }, required: ['postId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts index 3a6f868c8f..2345fd11b6 100644 --- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts +++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { DriveFilesRepository, GalleryPostsRepository } from '@/models/_.js'; import type { MiDriveFile } from '@/models/DriveFile.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; @@ -50,7 +50,7 @@ export const paramDef = { isSensitive: { type: 'boolean', default: false }, }, required: ['postId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/get-avatar-decorations.ts b/packages/backend/src/server/api/endpoints/get-avatar-decorations.ts index 7ed22106bd..bb72c3d721 100644 --- a/packages/backend/src/server/api/endpoints/get-avatar-decorations.ts +++ b/packages/backend/src/server/api/endpoints/get-avatar-decorations.ts @@ -7,7 +7,7 @@ import { IsNull } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { AvatarDecorationService } from '@/core/AvatarDecorationService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -60,7 +60,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts index acd44db473..6534bbd8d1 100644 --- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts +++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts @@ -9,7 +9,7 @@ import { USER_ONLINE_THRESHOLD } from '@/const.js'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -34,7 +34,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts index ddcbac67d5..e285705a99 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/list.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { HashtagsRepository } from '@/models/_.js'; import { HashtagEntityService } from '@/core/entities/HashtagEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { sort: { type: 'string', enum: ['+mentionedUsers', '-mentionedUsers', '+mentionedLocalUsers', '-mentionedLocalUsers', '+mentionedRemoteUsers', '-mentionedRemoteUsers', '+attachedUsers', '-attachedUsers', '+attachedLocalUsers', '-attachedLocalUsers', '+attachedRemoteUsers', '-attachedRemoteUsers'] }, }, required: ['sort'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts index 2ffcd321f1..2b9d4f3c9f 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/search.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { HashtagsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; @@ -34,7 +34,7 @@ export const paramDef = { offset: { type: 'integer', default: 0 }, }, required: ['query'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts index dfddb72ef1..b80a072d8f 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/show.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { HashtagsRepository } from '@/models/_.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { HashtagEntityService } from '@/core/entities/HashtagEntityService.js'; @@ -39,7 +39,7 @@ export const paramDef = { tag: { type: 'string' }, }, required: ['tag'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts index 1b1e326bc0..30e3280988 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { FeaturedService } from '@/core/FeaturedService.js'; import { HashtagService } from '@/core/HashtagService.js'; @@ -50,7 +50,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts index ab44de19f9..f919ac7c11 100644 --- a/packages/backend/src/server/api/endpoints/hashtags/users.ts +++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository } from '@/models/_.js'; import { safeForSql } from "@/misc/safe-for-sql.js"; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; @@ -39,7 +39,7 @@ export const paramDef = { origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' }, }, required: ['tag', 'sort'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts index 891a9c9340..e68eb79141 100644 --- a/packages/backend/src/server/api/endpoints/i.ts +++ b/packages/backend/src/server/api/endpoints/i.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserProfilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/2fa/done.ts b/packages/backend/src/server/api/endpoints/i/2fa/done.ts index b6376c30ee..535b4084b9 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts @@ -7,7 +7,7 @@ import * as OTPAuth from 'otpauth'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import type { UserProfilesRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -38,7 +38,7 @@ export const paramDef = { token: { type: 'string' }, }, required: ['token'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts index eb8ddcadfe..c1784c3283 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -55,7 +55,7 @@ export const paramDef = { credential: { type: 'object' }, }, required: ['password', 'name', 'credential'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // eslint-disable-next-line import/no-default-export @Injectable() diff --git a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts index e80f6fa96c..33f9f52de3 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -33,7 +33,7 @@ export const paramDef = { value: { type: 'boolean' }, }, required: ['value'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts index 685f3084fc..a3ada93098 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserProfilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { WebAuthnService } from '@/core/WebAuthnService.js'; @@ -182,7 +182,7 @@ export const paramDef = { token: { type: 'string', nullable: true }, }, required: ['password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // eslint-disable-next-line import/no-default-export @Injectable() diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts index dcf1216737..9593568abd 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts @@ -10,7 +10,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserProfilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import { ApiError } from '@/server/api/error.js'; @@ -50,7 +50,7 @@ export const paramDef = { token: { type: 'string', nullable: true }, }, required: ['password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts index fdd6f2dc21..bd163586ff 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -37,7 +37,7 @@ export const paramDef = { credentialId: { type: 'string' }, }, required: ['password', 'credentialId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts index 442c8f94f7..37b6eaa10e 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import type { UserProfilesRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -36,7 +36,7 @@ export const paramDef = { token: { type: 'string', nullable: true }, }, required: ['password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts index ccd9fdb63b..29776c3fc4 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserSecurityKeysRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -41,7 +41,7 @@ export const paramDef = { credentialId: { type: 'string' }, }, required: ['name', 'credentialId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/apps.ts b/packages/backend/src/server/api/endpoints/i/apps.ts index 68569826f2..b8932700c1 100644 --- a/packages/backend/src/server/api/endpoints/i/apps.ts +++ b/packages/backend/src/server/api/endpoints/i/apps.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AccessTokensRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; @@ -59,7 +59,7 @@ export const paramDef = { sort: { type: 'string', enum: ['+createdAt', '-createdAt', '+lastUsedAt', '-lastUsedAt'] }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts index 999f2ab26c..aca9d45094 100644 --- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts +++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull, Not } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AccessTokensRepository } from '@/models/_.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -60,7 +60,7 @@ export const paramDef = { sort: { type: 'string', enum: ['desc', 'asc'], default: 'desc' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/change-password.ts b/packages/backend/src/server/api/endpoints/i/change-password.ts index 806f9c8a28..0ba8c15748 100644 --- a/packages/backend/src/server/api/endpoints/i/change-password.ts +++ b/packages/backend/src/server/api/endpoints/i/change-password.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserProfilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { UserAuthService } from '@/core/UserAuthService.js'; @@ -26,7 +26,7 @@ export const paramDef = { token: { type: 'string', nullable: true }, }, required: ['currentPassword', 'newPassword'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/claim-achievement.ts b/packages/backend/src/server/api/endpoints/i/claim-achievement.ts index f7efb5e06b..88b22bb8be 100644 --- a/packages/backend/src/server/api/endpoints/i/claim-achievement.ts +++ b/packages/backend/src/server/api/endpoints/i/claim-achievement.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AchievementService, ACHIEVEMENT_TYPES } from '@/core/AchievementService.js'; export const meta = { @@ -21,7 +21,7 @@ export const paramDef = { name: { type: 'string', enum: ACHIEVEMENT_TYPES }, }, required: ['name'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/delete-account.ts b/packages/backend/src/server/api/endpoints/i/delete-account.ts index e5dfd63245..f9c5cd770b 100644 --- a/packages/backend/src/server/api/endpoints/i/delete-account.ts +++ b/packages/backend/src/server/api/endpoints/i/delete-account.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository, UserProfilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DeleteAccountService } from '@/core/DeleteAccountService.js'; import { DI } from '@/di-symbols.js'; import { UserAuthService } from '@/core/UserAuthService.js'; @@ -26,7 +26,7 @@ export const paramDef = { token: { type: 'string', nullable: true }, }, required: ['password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-antennas.ts b/packages/backend/src/server/api/endpoints/i/export-antennas.ts index b5dbb0dd75..ff6ea0cf05 100644 --- a/packages/backend/src/server/api/endpoints/i/export-antennas.ts +++ b/packages/backend/src/server/api/endpoints/i/export-antennas.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-blocking.ts b/packages/backend/src/server/api/endpoints/i/export-blocking.ts index 0ce81cd539..0d9fe7df38 100644 --- a/packages/backend/src/server/api/endpoints/i/export-blocking.ts +++ b/packages/backend/src/server/api/endpoints/i/export-blocking.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-clips.ts b/packages/backend/src/server/api/endpoints/i/export-clips.ts index d9a06e5a05..eeaeb978cf 100644 --- a/packages/backend/src/server/api/endpoints/i/export-clips.ts +++ b/packages/backend/src/server/api/endpoints/i/export-clips.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-favorites.ts b/packages/backend/src/server/api/endpoints/i/export-favorites.ts index 37f2d5f954..802dccff06 100644 --- a/packages/backend/src/server/api/endpoints/i/export-favorites.ts +++ b/packages/backend/src/server/api/endpoints/i/export-favorites.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-following.ts b/packages/backend/src/server/api/endpoints/i/export-following.ts index c9b7798149..287d19c0d8 100644 --- a/packages/backend/src/server/api/endpoints/i/export-following.ts +++ b/packages/backend/src/server/api/endpoints/i/export-following.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -26,7 +26,7 @@ export const paramDef = { excludeInactive: { type: 'boolean', default: false }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-mute.ts b/packages/backend/src/server/api/endpoints/i/export-mute.ts index a4678209cd..555a2405af 100644 --- a/packages/backend/src/server/api/endpoints/i/export-mute.ts +++ b/packages/backend/src/server/api/endpoints/i/export-mute.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-notes.ts b/packages/backend/src/server/api/endpoints/i/export-notes.ts index da14780881..6c022b53f1 100644 --- a/packages/backend/src/server/api/endpoints/i/export-notes.ts +++ b/packages/backend/src/server/api/endpoints/i/export-notes.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts index cc46fc3108..f88c7047fe 100644 --- a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts +++ b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts @@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; export const meta = { @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts index 4ed12973dd..9ea6fa071a 100644 --- a/packages/backend/src/server/api/endpoints/i/favorites.ts +++ b/packages/backend/src/server/api/endpoints/i/favorites.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { NoteFavoritesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteFavoriteEntityService } from '@/core/entities/NoteFavoriteEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts index 53ef14153b..25c6f297ff 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryLikesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryLikeEntityService } from '@/core/entities/GalleryLikeEntityService.js'; @@ -49,7 +49,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts index c40116ad7d..a906e4612b 100644 --- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/import-antennas.ts b/packages/backend/src/server/api/endpoints/i/import-antennas.ts index 67fd8286c2..d18df7a693 100644 --- a/packages/backend/src/server/api/endpoints/i/import-antennas.ts +++ b/packages/backend/src/server/api/endpoints/i/import-antennas.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; import type { AntennasRepository, DriveFilesRepository, UsersRepository, MiAntenna as _Antenna } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -54,7 +54,7 @@ export const paramDef = { fileId: { type: 'string', format: 'misskey:id' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() // eslint-disable-next-line import/no-default-export export default class extends Endpoint { diff --git a/packages/backend/src/server/api/endpoints/i/import-blocking.ts b/packages/backend/src/server/api/endpoints/i/import-blocking.ts index dea4c64dfd..7ddc30adec 100644 --- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts +++ b/packages/backend/src/server/api/endpoints/i/import-blocking.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; import type { DriveFilesRepository } from '@/models/_.js'; @@ -57,7 +57,7 @@ export const paramDef = { fileId: { type: 'string', format: 'misskey:id' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/import-following.ts b/packages/backend/src/server/api/endpoints/i/import-following.ts index c7018c91bd..f855cd92fa 100644 --- a/packages/backend/src/server/api/endpoints/i/import-following.ts +++ b/packages/backend/src/server/api/endpoints/i/import-following.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; import type { DriveFilesRepository } from '@/models/_.js'; @@ -57,7 +57,7 @@ export const paramDef = { withReplies: { type: 'boolean' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/import-muting.ts b/packages/backend/src/server/api/endpoints/i/import-muting.ts index 6ce29aa8df..31e9ac2e76 100644 --- a/packages/backend/src/server/api/endpoints/i/import-muting.ts +++ b/packages/backend/src/server/api/endpoints/i/import-muting.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; import type { DriveFilesRepository } from '@/models/_.js'; @@ -57,7 +57,7 @@ export const paramDef = { fileId: { type: 'string', format: 'misskey:id' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts index 1747c19b67..725cf211b0 100644 --- a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts +++ b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueueService } from '@/core/QueueService.js'; import { AccountMoveService } from '@/core/AccountMoveService.js'; import type { DriveFilesRepository } from '@/models/_.js'; @@ -56,7 +56,7 @@ export const paramDef = { fileId: { type: 'string', format: 'misskey:id' }, }, required: ['fileId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts index 73414b7e71..4bf23b7f75 100644 --- a/packages/backend/src/server/api/endpoints/i/move.ts +++ b/packages/backend/src/server/api/endpoints/i/move.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ApiError } from '@/server/api/error.js'; import { MiLocalUser, MiRemoteUser } from '@/models/User.js'; @@ -78,7 +78,7 @@ export const paramDef = { moveToAccount: { type: 'string' }, }, required: ['moveToAccount'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts b/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts index dd1b71583a..8b9a38a60f 100644 --- a/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts +++ b/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts @@ -10,7 +10,7 @@ import type { NotesRepository } from '@/models/_.js'; import { obsoleteNotificationTypes, groupedNotificationTypes, FilterUnionByProperty } from '@/types.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteReadService } from '@/core/NoteReadService.js'; import { NotificationEntityService } from '@/core/entities/NotificationEntityService.js'; import { NotificationService } from '@/core/NotificationService.js'; @@ -57,7 +57,7 @@ export const paramDef = { } }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts index 649221685f..1a1a89f2dd 100644 --- a/packages/backend/src/server/api/endpoints/i/notifications.ts +++ b/packages/backend/src/server/api/endpoints/i/notifications.ts @@ -10,7 +10,7 @@ import type { NotesRepository } from '@/models/_.js'; import { FilterUnionByProperty, notificationTypes, obsoleteNotificationTypes } from '@/types.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteReadService } from '@/core/NoteReadService.js'; import { NotificationEntityService } from '@/core/entities/NotificationEntityService.js'; import { NotificationService } from '@/core/NotificationService.js'; @@ -57,7 +57,7 @@ export const paramDef = { } }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts index 77983ddbf8..3a35f15196 100644 --- a/packages/backend/src/server/api/endpoints/i/page-likes.ts +++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { PageLikesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { PageLikeEntityService } from '@/core/entities/PageLikeEntityService.js'; @@ -48,7 +48,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts index eb04dec734..a2e453334a 100644 --- a/packages/backend/src/server/api/endpoints/i/pages.ts +++ b/packages/backend/src/server/api/endpoints/i/pages.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { PagesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/pin.ts b/packages/backend/src/server/api/endpoints/i/pin.ts index 71634fa39e..d936739d1e 100644 --- a/packages/backend/src/server/api/endpoints/i/pin.ts +++ b/packages/backend/src/server/api/endpoints/i/pin.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { NotePiningService } from '@/core/NotePiningService.js'; import { ApiError } from '../../error.js'; @@ -52,7 +52,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts index d535a891ad..1e2b10a069 100644 --- a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts +++ b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { NoteUnreadsRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -23,7 +23,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/read-announcement.ts b/packages/backend/src/server/api/endpoints/i/read-announcement.ts index 935f1d55dd..1bf3f8babd 100644 --- a/packages/backend/src/server/api/endpoints/i/read-announcement.ts +++ b/packages/backend/src/server/api/endpoints/i/read-announcement.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; export const meta = { @@ -26,7 +26,7 @@ export const paramDef = { announcementId: { type: 'string', format: 'misskey:id' }, }, required: ['announcementId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts index b1a3a45f80..174ea66f44 100644 --- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts +++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts @@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UsersRepository, UserProfilesRepository } from '@/models/_.js'; import generateUserToken from '@/misc/generate-native-user-token.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -25,7 +25,7 @@ export const paramDef = { password: { type: 'string' }, }, required: ['password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts index af33520770..78bbac1f9e 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; export const meta = { @@ -27,7 +27,7 @@ export const paramDef = { domain: { type: 'string', nullable: true }, }, required: ['scope'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts index 9c41674d32..653085052d 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; import { ApiError } from '../../../error.js'; @@ -46,7 +46,7 @@ export const paramDef = { domain: { type: 'string', nullable: true }, }, required: ['key', 'scope'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/get.ts b/packages/backend/src/server/api/endpoints/i/registry/get.ts index a1b27677c2..52404d6715 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; import { ApiError } from '../../../error.js'; @@ -37,7 +37,7 @@ export const paramDef = { domain: { type: 'string', nullable: true }, }, required: ['key', 'scope'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts index 434071b0e1..2f2e4c4706 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; export const meta = { @@ -30,7 +30,7 @@ export const paramDef = { domain: { type: 'string', nullable: true }, }, required: ['scope'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys.ts b/packages/backend/src/server/api/endpoints/i/registry/keys.ts index 7f6ccf4d5f..65d971dd03 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/keys.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/keys.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; export const meta = { @@ -30,7 +30,7 @@ export const paramDef = { domain: { type: 'string', nullable: true }, }, required: ['scope'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/remove.ts b/packages/backend/src/server/api/endpoints/i/registry/remove.ts index 1345c1c124..74808adee3 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/remove.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/remove.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RegistryItemsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; @@ -35,7 +35,7 @@ export const paramDef = { domain: { type: 'string', nullable: true }, }, required: ['key', 'scope'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes-with-domain.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes-with-domain.ts index 9e684164f1..b270e94efc 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/scopes-with-domain.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/scopes-with-domain.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; export const meta = { @@ -40,7 +40,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/registry/set.ts b/packages/backend/src/server/api/endpoints/i/registry/set.ts index 158ca6eb0c..0b29d87c45 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/set.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/set.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { RegistryApiService } from '@/core/RegistryApiService.js'; export const meta = { @@ -25,7 +25,7 @@ export const paramDef = { domain: { type: 'string', nullable: true }, }, required: ['key', 'value', 'scope'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/revoke-token.ts b/packages/backend/src/server/api/endpoints/i/revoke-token.ts index 9862009921..46f2cc0018 100644 --- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts +++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AccessTokensRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -26,7 +26,7 @@ export const paramDef = { { required: ['tokenId'] }, { required: ['token'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/signin-history.ts b/packages/backend/src/server/api/endpoints/i/signin-history.ts index bba15c97c4..027d4bd64e 100644 --- a/packages/backend/src/server/api/endpoints/i/signin-history.ts +++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { SigninsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { SigninEntityService } from '@/core/entities/SigninEntityService.js'; @@ -35,7 +35,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/unpin.ts b/packages/backend/src/server/api/endpoints/i/unpin.ts index e90d2a4479..d6375515c2 100644 --- a/packages/backend/src/server/api/endpoints/i/unpin.ts +++ b/packages/backend/src/server/api/endpoints/i/unpin.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { NotePiningService } from '@/core/NotePiningService.js'; import { ApiError } from '../../error.js'; @@ -39,7 +39,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts index b182b30026..8ba57cae38 100644 --- a/packages/backend/src/server/api/endpoints/i/update-email.ts +++ b/packages/backend/src/server/api/endpoints/i/update-email.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import bcrypt from 'bcryptjs'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserProfilesRepository } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { EmailService } from '@/core/EmailService.js'; @@ -64,7 +64,7 @@ export const paramDef = { token: { type: 'string', nullable: true }, }, required: ['password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index dc4993be63..f02cdfce3f 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -20,7 +20,7 @@ import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { langmap } from '@/misc/langmap.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { UserFollowingService } from '@/core/UserFollowingService.js'; @@ -217,7 +217,7 @@ export const paramDef = { items: { type: 'string' }, }, }, -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts index f5cef0412d..750a57a309 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { IdService } from '@/core/IdService.js'; import type { WebhooksRepository } from '@/models/_.js'; import { webhookEventTypes } from '@/models/Webhook.js'; @@ -69,7 +69,7 @@ export const paramDef = { } }, }, required: ['name', 'url', 'on'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts index ea6305a155..ff426b897c 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { WebhooksRepository } from '@/models/_.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -34,7 +34,7 @@ export const paramDef = { webhookId: { type: 'string', format: 'misskey:id' }, }, required: ['webhookId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts index 6164e0bbca..3ca35e68f0 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { webhookEventTypes } from '@/models/Webhook.js'; import type { WebhooksRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -53,7 +53,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts index 7914d4caea..2fec0b91dd 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { webhookEventTypes } from '@/models/Webhook.js'; import type { WebhooksRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -61,7 +61,7 @@ export const paramDef = { webhookId: { type: 'string', format: 'misskey:id' }, }, required: ['webhookId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts index dfdce26bdc..474ca5d566 100644 --- a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts +++ b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { WebhooksRepository } from '@/models/_.js'; import { webhookEventTypes } from '@/models/Webhook.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; @@ -43,7 +43,7 @@ export const paramDef = { active: { type: 'boolean' }, }, required: ['webhookId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/invite/create.ts b/packages/backend/src/server/api/endpoints/invite/create.ts index ecbb69a8ac..14b466c3fa 100644 --- a/packages/backend/src/server/api/endpoints/invite/create.ts +++ b/packages/backend/src/server/api/endpoints/invite/create.ts @@ -7,7 +7,7 @@ import { MoreThan } from 'typeorm'; import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RegistrationTicketsRepository } from '@/models/_.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { IdService } from '@/core/IdService.js'; @@ -42,7 +42,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/invite/delete.ts b/packages/backend/src/server/api/endpoints/invite/delete.ts index aa2e7ec4ec..455cf105f1 100644 --- a/packages/backend/src/server/api/endpoints/invite/delete.ts +++ b/packages/backend/src/server/api/endpoints/invite/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RegistrationTicketsRepository } from '@/models/_.js'; import { RoleService } from '@/core/RoleService.js'; import { DI } from '@/di-symbols.js'; @@ -46,7 +46,7 @@ export const paramDef = { inviteId: { type: 'string', format: 'misskey:id' }, }, required: ['inviteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/invite/limit.ts b/packages/backend/src/server/api/endpoints/invite/limit.ts index 0f9203af35..834c8ce03f 100644 --- a/packages/backend/src/server/api/endpoints/invite/limit.ts +++ b/packages/backend/src/server/api/endpoints/invite/limit.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MoreThan } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RegistrationTicketsRepository } from '@/models/_.js'; import { RoleService } from '@/core/RoleService.js'; import { DI } from '@/di-symbols.js'; @@ -36,7 +36,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/invite/list.ts b/packages/backend/src/server/api/endpoints/invite/list.ts index 98bd0064a3..c9a77ceae6 100644 --- a/packages/backend/src/server/api/endpoints/invite/list.ts +++ b/packages/backend/src/server/api/endpoints/invite/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RegistrationTicketsRepository } from '@/models/_.js'; import { InviteCodeEntityService } from '@/core/entities/InviteCodeEntityService.js'; import { QueryService } from '@/core/QueryService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index 5b469f5487..530662e15c 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { MetaEntityService } from '@/core/entities/MetaEntityService.js'; export const meta = { @@ -29,7 +29,7 @@ export const paramDef = { detail: { type: 'boolean', default: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts index 1c39995da2..f0add242a7 100644 --- a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts +++ b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AccessTokensRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { secureRndstr } from '@/misc/secure-rndstr.js'; @@ -43,7 +43,7 @@ export const paramDef = { } }, }, required: ['session', 'permission'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts index 6307ee33f4..e55a244b93 100644 --- a/packages/backend/src/server/api/endpoints/mute/create.ts +++ b/packages/backend/src/server/api/endpoints/mute/create.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { MutingsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -59,7 +59,7 @@ export const paramDef = { }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/mute/delete.ts b/packages/backend/src/server/api/endpoints/mute/delete.ts index 9bf96d492b..09fc966c5c 100644 --- a/packages/backend/src/server/api/endpoints/mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/mute/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { MutingsRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -47,7 +47,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts index e386bacc23..aa83f3a471 100644 --- a/packages/backend/src/server/api/endpoints/mute/list.ts +++ b/packages/backend/src/server/api/endpoints/mute/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { MutingsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { MutingEntityService } from '@/core/entities/MutingEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/my/apps.ts b/packages/backend/src/server/api/endpoints/my/apps.ts index 20270d57b0..544df22d39 100644 --- a/packages/backend/src/server/api/endpoints/my/apps.ts +++ b/packages/backend/src/server/api/endpoints/my/apps.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { AppsRepository } from '@/models/_.js'; import { AppEntityService } from '@/core/entities/AppEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -35,7 +35,7 @@ export const paramDef = { offset: { type: 'integer', default: 0 }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts index 86566a8eaa..8403150e0e 100644 --- a/packages/backend/src/server/api/endpoints/notes.ts +++ b/packages/backend/src/server/api/endpoints/notes.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -39,7 +39,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts index ff5a100d67..90ef8a6843 100644 --- a/packages/backend/src/server/api/endpoints/notes/children.ts +++ b/packages/backend/src/server/api/endpoints/notes/children.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/clips.ts b/packages/backend/src/server/api/endpoints/notes/clips.ts index bdedda5c9e..9dacf7d4e3 100644 --- a/packages/backend/src/server/api/endpoints/notes/clips.ts +++ b/packages/backend/src/server/api/endpoints/notes/clips.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { ClipNotesRepository, ClipsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -44,7 +44,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/conversation.ts b/packages/backend/src/server/api/endpoints/notes/conversation.ts index 5bf840e749..aab3340ed0 100644 --- a/packages/backend/src/server/api/endpoints/notes/conversation.ts +++ b/packages/backend/src/server/api/endpoints/notes/conversation.ts @@ -8,7 +8,7 @@ import type { MiNote } from '@/models/Note.js'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -46,7 +46,7 @@ export const paramDef = { offset: { type: 'integer', default: 0 }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index fc75453f9b..abc01352cb 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -14,7 +14,7 @@ import type { MiChannel } from '@/models/Channel.js'; import { MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { NoteCreateService } from '@/core/NoteCreateService.js'; import { DI } from '@/di-symbols.js'; @@ -222,7 +222,7 @@ export const paramDef = { }, required: ['text'], }, -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts index 8096a61f95..cccb50437b 100644 --- a/packages/backend/src/server/api/endpoints/notes/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/delete.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteDeleteService } from '@/core/NoteDeleteService.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -49,7 +49,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts index 03fc1a7e52..68313ce20a 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts @@ -9,7 +9,7 @@ import type { NoteFavoritesRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; import { AchievementService } from '@/core/AchievementService.js'; @@ -49,7 +49,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts index 5bb7dcc9ed..776dc5581a 100644 --- a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; import type { NoteFavoritesRepository } from '@/models/_.js'; @@ -40,7 +40,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts index ce4c997121..8ea4ad31fb 100644 --- a/packages/backend/src/server/api/endpoints/notes/featured.ts +++ b/packages/backend/src/server/api/endpoints/notes/featured.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; import { FeaturedService } from '@/core/FeaturedService.js'; @@ -40,7 +40,7 @@ export const paramDef = { channelId: { type: 'string', nullable: true, format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts index 27e225a06a..25c81f205b 100644 --- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts @@ -8,7 +8,7 @@ import { Brackets } from 'typeorm'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; @@ -50,7 +50,7 @@ export const paramDef = { untilDate: { type: 'integer' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts index 49024d48b6..da1ae7a349 100644 --- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository, ChannelFollowingsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -71,7 +71,7 @@ export const paramDef = { withReplies: { type: 'boolean', default: false }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts index 9fa9c0b262..173f662410 100644 --- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; import { DI } from '@/di-symbols.js'; @@ -63,7 +63,7 @@ export const paramDef = { untilDate: { type: 'integer' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts index 8f7ac3826a..becb744a95 100644 --- a/packages/backend/src/server/api/endpoints/notes/mentions.ts +++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository, FollowingsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { NoteReadService } from '@/core/NoteReadService.js'; @@ -41,7 +41,7 @@ export const paramDef = { visibility: { type: 'string' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts index 15fec2f00f..bb6a5eee22 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository, MutingsRepository, PollsRepository, PollVotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { excludeChannels: { type: 'boolean', default: false }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts index 141c089598..108df64209 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts @@ -9,7 +9,7 @@ import type { MiRemoteUser } from '@/models/User.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { QueueService } from '@/core/QueueService.js'; import { PollService } from '@/core/PollService.js'; @@ -74,7 +74,7 @@ export const paramDef = { choice: { type: 'integer' }, }, required: ['noteId', 'choice'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts index d74a7b28ab..476b600f37 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts @@ -9,7 +9,7 @@ import type { NoteReactionsRepository } from '@/models/_.js'; import type { MiNoteReaction } from '@/models/NoteReaction.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js'; import { DI } from '@/di-symbols.js'; import { QueryService } from '@/core/QueryService.js'; @@ -51,7 +51,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/reactions/create.ts b/packages/backend/src/server/api/endpoints/notes/reactions/create.ts index 861654f11a..411f57dba2 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions/create.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ReactionService } from '@/core/ReactionService.js'; import { ApiError } from '../../../error.js'; @@ -54,7 +54,7 @@ export const paramDef = { reaction: { type: 'string' }, }, required: ['noteId', 'reaction'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts index fd60c847cf..01499e8b4d 100644 --- a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts @@ -7,7 +7,7 @@ import ms from 'ms'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ReactionService } from '@/core/ReactionService.js'; import { ApiError } from '../../../error.js'; @@ -46,7 +46,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts index c7c66c85c9..efb92661dd 100644 --- a/packages/backend/src/server/api/endpoints/notes/renotes.ts +++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -47,7 +47,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts index 0e3fc6cf53..8906875243 100644 --- a/packages/backend/src/server/api/endpoints/notes/replies.ts +++ b/packages/backend/src/server/api/endpoints/notes/replies.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts index 706d6e91c2..7b28ee767e 100644 --- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts +++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts @@ -10,7 +10,7 @@ import { safeForSql } from '@/misc/safe-for-sql.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -63,7 +63,7 @@ export const paramDef = { { required: ['tag'] }, { required: ['query'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts index 97bc61cd78..77cc04b8b1 100644 --- a/packages/backend/src/server/api/endpoints/notes/search.ts +++ b/packages/backend/src/server/api/endpoints/notes/search.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { SearchService } from '@/core/SearchService.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -52,7 +52,7 @@ export const paramDef = { channelId: { type: 'string', format: 'misskey:id', nullable: true, default: null }, }, required: ['query'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/notes/show.ts b/packages/backend/src/server/api/endpoints/notes/show.ts index 60a3d71983..1b83dbad8c 100644 --- a/packages/backend/src/server/api/endpoints/notes/show.ts +++ b/packages/backend/src/server/api/endpoints/notes/show.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -37,7 +37,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/state.ts b/packages/backend/src/server/api/endpoints/notes/state.ts index 4c76adcd4f..1a0c2c24fb 100644 --- a/packages/backend/src/server/api/endpoints/notes/state.ts +++ b/packages/backend/src/server/api/endpoints/notes/state.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository, NoteThreadMutingsRepository, NoteFavoritesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -38,7 +38,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts index 3ae3587786..99a740edfb 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts @@ -9,7 +9,7 @@ import type { NotesRepository, NoteThreadMutingsRepository } from '@/models/_.js import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { NoteReadService } from '@/core/NoteReadService.js'; import { DI } from '@/di-symbols.js'; @@ -42,7 +42,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts index f069510608..49dcbaa82d 100644 --- a/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts +++ b/packages/backend/src/server/api/endpoints/notes/thread-muting/delete.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NoteThreadMutingsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -34,7 +34,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 03433cc4f0..4932995e54 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository, ChannelFollowingsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; @@ -53,7 +53,7 @@ export const paramDef = { withRenotes: { type: 'boolean', default: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts index d19acdd520..19a979e47c 100644 --- a/packages/backend/src/server/api/endpoints/notes/translate.ts +++ b/packages/backend/src/server/api/endpoints/notes/translate.ts @@ -7,7 +7,7 @@ import { URLSearchParams } from 'node:url'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { MetaService } from '@/core/MetaService.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; @@ -56,7 +56,7 @@ export const paramDef = { targetLang: { type: 'string' }, }, required: ['noteId', 'targetLang'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts index 38d0213c49..e865460691 100644 --- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts +++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository, NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteDeleteService } from '@/core/NoteDeleteService.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -42,7 +42,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts index 8d0442d6bf..b0971269dd 100644 --- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts @@ -8,7 +8,7 @@ import { Brackets } from 'typeorm'; import type { MiUserList, NotesRepository, UserListMembershipsRepository, UserListsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import ActiveUsersChart from '@/core/chart/charts/active-users.js'; import { DI } from '@/di-symbols.js'; @@ -66,7 +66,7 @@ export const paramDef = { }, }, required: ['listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notifications/create.ts b/packages/backend/src/server/api/endpoints/notifications/create.ts index a727c9c9ae..bb4ece51d7 100644 --- a/packages/backend/src/server/api/endpoints/notifications/create.ts +++ b/packages/backend/src/server/api/endpoints/notifications/create.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NotificationService } from '@/core/NotificationService.js'; export const meta = { @@ -33,7 +33,7 @@ export const paramDef = { icon: { type: 'string', nullable: true }, }, required: ['body'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notifications/flush.ts b/packages/backend/src/server/api/endpoints/notifications/flush.ts index e205a86b96..40d3b3fec1 100644 --- a/packages/backend/src/server/api/endpoints/notifications/flush.ts +++ b/packages/backend/src/server/api/endpoints/notifications/flush.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NotificationService } from '@/core/NotificationService.js'; export const meta = { @@ -21,7 +21,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts b/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts index 0682744caf..764086b761 100644 --- a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts +++ b/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NotificationService } from '@/core/NotificationService.js'; export const meta = { @@ -21,7 +21,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/notifications/test-notification.ts b/packages/backend/src/server/api/endpoints/notifications/test-notification.ts index a08faa885b..a89f928eed 100644 --- a/packages/backend/src/server/api/endpoints/notifications/test-notification.ts +++ b/packages/backend/src/server/api/endpoints/notifications/test-notification.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NotificationService } from '@/core/NotificationService.js'; export const meta = { @@ -26,7 +26,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/page-push.ts b/packages/backend/src/server/api/endpoints/page-push.ts index 32dd7f7069..818ec355f4 100644 --- a/packages/backend/src/server/api/endpoints/page-push.ts +++ b/packages/backend/src/server/api/endpoints/page-push.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { PagesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { GlobalEventService } from '@/core/GlobalEventService.js'; import { DI } from '@/di-symbols.js'; @@ -34,7 +34,7 @@ export const paramDef = { var: {}, }, required: ['pageId', 'event'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts index 82d638c98b..dde0d562ac 100644 --- a/packages/backend/src/server/api/endpoints/pages/create.ts +++ b/packages/backend/src/server/api/endpoints/pages/create.ts @@ -10,7 +10,7 @@ import { IdService } from '@/core/IdService.js'; import { MiPage } from '@/models/Page.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -68,7 +68,7 @@ export const paramDef = { hideTitleWhenPinned: { type: 'boolean', default: false }, }, required: ['title', 'name', 'content', 'variables', 'script'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pages/delete.ts b/packages/backend/src/server/api/endpoints/pages/delete.ts index 40ce738d61..0e82561c06 100644 --- a/packages/backend/src/server/api/endpoints/pages/delete.ts +++ b/packages/backend/src/server/api/endpoints/pages/delete.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { PagesRepository, UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; import { RoleService } from '@/core/RoleService.js'; @@ -41,7 +41,7 @@ export const paramDef = { pageId: { type: 'string', format: 'misskey:id' }, }, required: ['pageId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pages/featured.ts b/packages/backend/src/server/api/endpoints/pages/featured.ts index f8e1bc5af7..110d3e8cd6 100644 --- a/packages/backend/src/server/api/endpoints/pages/featured.ts +++ b/packages/backend/src/server/api/endpoints/pages/featured.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { PagesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -31,7 +31,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts index 89d2a30441..7eca863371 100644 --- a/packages/backend/src/server/api/endpoints/pages/like.ts +++ b/packages/backend/src/server/api/endpoints/pages/like.ts @@ -8,7 +8,7 @@ import type { PagesRepository, PageLikesRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -48,7 +48,7 @@ export const paramDef = { pageId: { type: 'string', format: 'misskey:id' }, }, required: ['pageId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pages/show.ts b/packages/backend/src/server/api/endpoints/pages/show.ts index 4335ec527b..8adc9fbeb0 100644 --- a/packages/backend/src/server/api/endpoints/pages/show.ts +++ b/packages/backend/src/server/api/endpoints/pages/show.ts @@ -9,7 +9,7 @@ import type { UsersRepository, PagesRepository } from '@/models/_.js'; import type { MiPage } from '@/models/Page.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -45,7 +45,7 @@ export const paramDef = { { required: ['pageId'] }, { required: ['name', 'username'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pages/unlike.ts b/packages/backend/src/server/api/endpoints/pages/unlike.ts index 6a306dfb52..5bd559bbee 100644 --- a/packages/backend/src/server/api/endpoints/pages/unlike.ts +++ b/packages/backend/src/server/api/endpoints/pages/unlike.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { PagesRepository, PageLikesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { pageId: { type: 'string', format: 'misskey:id' }, }, required: ['pageId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts index 7edcd4458d..11afd8843f 100644 --- a/packages/backend/src/server/api/endpoints/pages/update.ts +++ b/packages/backend/src/server/api/endpoints/pages/update.ts @@ -9,7 +9,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { PagesRepository, DriveFilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../error.js'; @@ -73,7 +73,7 @@ export const paramDef = { hideTitleWhenPinned: { type: 'boolean' }, }, required: ['pageId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/ping.ts b/packages/backend/src/server/api/endpoints/ping.ts index a52759ba0b..4383e68976 100644 --- a/packages/backend/src/server/api/endpoints/ping.ts +++ b/packages/backend/src/server/api/endpoints/ping.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; export const meta = { requireCredential: false, @@ -29,7 +29,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts index a21f268e04..06c4dcebe9 100644 --- a/packages/backend/src/server/api/endpoints/pinned-users.ts +++ b/packages/backend/src/server/api/endpoints/pinned-users.ts @@ -10,7 +10,7 @@ import * as Acct from '@/misc/acct.js'; import type { MiUser } from '@/models/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { MetaService } from '@/core/MetaService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -35,7 +35,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/promo/read.ts b/packages/backend/src/server/api/endpoints/promo/read.ts index db2b778fd0..4332653da0 100644 --- a/packages/backend/src/server/api/endpoints/promo/read.ts +++ b/packages/backend/src/server/api/endpoints/promo/read.ts @@ -8,7 +8,7 @@ import type { PromoReadsRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -34,7 +34,7 @@ export const paramDef = { noteId: { type: 'string', format: 'misskey:id' }, }, required: ['noteId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts index bb2c08e148..7973e11e91 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -54,7 +54,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts index d58cdf64e1..b3b3571029 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/delete.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/delete.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; import { ApiError } from '../../error.js'; @@ -47,7 +47,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/renote-mute/list.ts b/packages/backend/src/server/api/endpoints/renote-mute/list.ts index 7a589056e6..383edd33b3 100644 --- a/packages/backend/src/server/api/endpoints/renote-mute/list.ts +++ b/packages/backend/src/server/api/endpoints/renote-mute/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RenoteMutingsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { RenoteMutingEntityService } from '@/core/entities/RenoteMutingEntityService.js'; @@ -38,7 +38,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/request-reset-password.ts b/packages/backend/src/server/api/endpoints/request-reset-password.ts index ee5b0d90cc..acfbe88c23 100644 --- a/packages/backend/src/server/api/endpoints/request-reset-password.ts +++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts @@ -9,7 +9,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { PasswordResetRequestsRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { IdService } from '@/core/IdService.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { email: { type: 'string' }, }, required: ['username', 'email'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reset-db.ts b/packages/backend/src/server/api/endpoints/reset-db.ts index 5ecfad0c58..0ea2233ae5 100644 --- a/packages/backend/src/server/api/endpoints/reset-db.ts +++ b/packages/backend/src/server/api/endpoints/reset-db.ts @@ -8,7 +8,7 @@ import { DataSource } from 'typeorm'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { resetDb } from '@/misc/reset-db.js'; @@ -28,7 +28,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts index 4c06b53f23..593313775a 100644 --- a/packages/backend/src/server/api/endpoints/reset-password.ts +++ b/packages/backend/src/server/api/endpoints/reset-password.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserProfilesRepository, PasswordResetRequestsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { IdService } from '@/core/IdService.js'; @@ -31,7 +31,7 @@ export const paramDef = { password: { type: 'string' }, }, required: ['token', 'password'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/retention.ts b/packages/backend/src/server/api/endpoints/retention.ts index 940fd106ef..d69dfe1ae5 100644 --- a/packages/backend/src/server/api/endpoints/retention.ts +++ b/packages/backend/src/server/api/endpoints/retention.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { RetentionAggregationsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -52,7 +52,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reversi/cancel-match.ts b/packages/backend/src/server/api/endpoints/reversi/cancel-match.ts index fedaccf15b..92554fa690 100644 --- a/packages/backend/src/server/api/endpoints/reversi/cancel-match.ts +++ b/packages/backend/src/server/api/endpoints/reversi/cancel-match.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ReversiService } from '@/core/ReversiService.js'; export const meta = { @@ -24,7 +24,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id', nullable: true }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reversi/games.ts b/packages/backend/src/server/api/endpoints/reversi/games.ts index 1fd63a1758..b3b0b7525e 100644 --- a/packages/backend/src/server/api/endpoints/reversi/games.ts +++ b/packages/backend/src/server/api/endpoints/reversi/games.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Brackets } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js'; import { DI } from '@/di-symbols.js'; import type { ReversiGamesRepository } from '@/models/_.js'; @@ -32,7 +32,7 @@ export const paramDef = { my: { type: 'boolean', default: false }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reversi/invitations.ts b/packages/backend/src/server/api/endpoints/reversi/invitations.ts index 6a8344e69b..82709f7b52 100644 --- a/packages/backend/src/server/api/endpoints/reversi/invitations.ts +++ b/packages/backend/src/server/api/endpoints/reversi/invitations.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { ReversiService } from '@/core/ReversiService.js'; @@ -24,7 +24,7 @@ export const meta = { } as const satisfies IEndpointMeta; export const paramDef = { -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reversi/match.ts b/packages/backend/src/server/api/endpoints/reversi/match.ts index cefaf1669e..85b3b897be 100644 --- a/packages/backend/src/server/api/endpoints/reversi/match.ts +++ b/packages/backend/src/server/api/endpoints/reversi/match.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ReversiService } from '@/core/ReversiService.js'; import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js'; import { ApiError } from '../../error.js'; @@ -46,7 +46,7 @@ export const paramDef = { multiple: { type: 'boolean', default: false }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reversi/show-game.ts b/packages/backend/src/server/api/endpoints/reversi/show-game.ts index 1470682cab..df9441e38c 100644 --- a/packages/backend/src/server/api/endpoints/reversi/show-game.ts +++ b/packages/backend/src/server/api/endpoints/reversi/show-game.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ReversiService } from '@/core/ReversiService.js'; import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js'; import { ApiError } from '../../error.js'; @@ -35,7 +35,7 @@ export const paramDef = { gameId: { type: 'string', format: 'misskey:id' }, }, required: ['gameId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reversi/surrender.ts b/packages/backend/src/server/api/endpoints/reversi/surrender.ts index f45f100f50..e0912b9b47 100644 --- a/packages/backend/src/server/api/endpoints/reversi/surrender.ts +++ b/packages/backend/src/server/api/endpoints/reversi/surrender.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ReversiService } from '@/core/ReversiService.js'; import { ApiError } from '../../error.js'; @@ -42,7 +42,7 @@ export const paramDef = { gameId: { type: 'string', format: 'misskey:id' }, }, required: ['gameId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/reversi/verify.ts b/packages/backend/src/server/api/endpoints/reversi/verify.ts index 528ac156e5..5a1ecd9e0b 100644 --- a/packages/backend/src/server/api/endpoints/reversi/verify.ts +++ b/packages/backend/src/server/api/endpoints/reversi/verify.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { ReversiService } from '@/core/ReversiService.js'; import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js'; import { ApiError } from '../../error.js'; @@ -41,7 +41,7 @@ export const paramDef = { crc32: { type: 'string' }, }, required: ['gameId', 'crc32'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/roles/list.ts b/packages/backend/src/server/api/endpoints/roles/list.ts index 50aa6ade45..51da402f27 100644 --- a/packages/backend/src/server/api/endpoints/roles/list.ts +++ b/packages/backend/src/server/api/endpoints/roles/list.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { RolesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; @@ -34,7 +34,7 @@ export const paramDef = { }, required: [ ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/roles/notes.ts b/packages/backend/src/server/api/endpoints/roles/notes.ts index e8be4fac82..0f8dc1008a 100644 --- a/packages/backend/src/server/api/endpoints/roles/notes.ts +++ b/packages/backend/src/server/api/endpoints/roles/notes.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import * as Redis from 'ioredis'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { NotesRepository, RolesRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; @@ -52,7 +52,7 @@ export const paramDef = { untilDate: { type: 'integer' }, }, required: ['roleId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/roles/show.ts b/packages/backend/src/server/api/endpoints/roles/show.ts index b4ebb500c5..c716dc0789 100644 --- a/packages/backend/src/server/api/endpoints/roles/show.ts +++ b/packages/backend/src/server/api/endpoints/roles/show.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { RolesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { RoleEntityService } from '@/core/entities/RoleEntityService.js'; import { ApiError } from '../../error.js'; @@ -38,7 +38,7 @@ export const paramDef = { roleId: { type: 'string', format: 'misskey:id' }, }, required: ['roleId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/roles/users.ts b/packages/backend/src/server/api/endpoints/roles/users.ts index 080aaf3862..aa6f080be2 100644 --- a/packages/backend/src/server/api/endpoints/roles/users.ts +++ b/packages/backend/src/server/api/endpoints/roles/users.ts @@ -8,7 +8,7 @@ import { Brackets } from 'typeorm'; import type { RoleAssignmentsRepository, RolesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { DI } from '@/di-symbols.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; @@ -56,7 +56,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: ['roleId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts index 6fecd8384c..a61a2c5b2e 100644 --- a/packages/backend/src/server/api/endpoints/server-info.ts +++ b/packages/backend/src/server/api/endpoints/server-info.ts @@ -8,7 +8,7 @@ import si from 'systeminformation'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { MetaService } from '@/core/MetaService.js'; export const meta = { @@ -70,7 +70,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts index 1fa238bed1..aab91b702e 100644 --- a/packages/backend/src/server/api/endpoints/stats.ts +++ b/packages/backend/src/server/api/endpoints/stats.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { InstancesRepository, NoteReactionsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import NotesChart from '@/core/chart/charts/notes.js'; import UsersChart from '@/core/chart/charts/users.js'; @@ -57,7 +57,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts index 8b8bef5cdc..48757d2016 100644 --- a/packages/backend/src/server/api/endpoints/sw/register.ts +++ b/packages/backend/src/server/api/endpoints/sw/register.ts @@ -8,7 +8,7 @@ import { IdService } from '@/core/IdService.js'; import type { SwSubscriptionsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { MetaService } from '@/core/MetaService.js'; import { DI } from '@/di-symbols.js'; import { PushNotificationService } from '@/core/PushNotificationService.js'; diff --git a/packages/backend/src/server/api/endpoints/sw/show-registration.ts b/packages/backend/src/server/api/endpoints/sw/show-registration.ts index 29f4d31050..3778c54bae 100644 --- a/packages/backend/src/server/api/endpoints/sw/show-registration.ts +++ b/packages/backend/src/server/api/endpoints/sw/show-registration.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { SwSubscriptionsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; export const meta = { @@ -44,7 +44,7 @@ export const paramDef = { endpoint: { type: 'string' }, }, required: ['endpoint'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/sw/unregister.ts b/packages/backend/src/server/api/endpoints/sw/unregister.ts index e1b3036efb..e53a008a0c 100644 --- a/packages/backend/src/server/api/endpoints/sw/unregister.ts +++ b/packages/backend/src/server/api/endpoints/sw/unregister.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { SwSubscriptionsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { PushNotificationService } from '@/core/PushNotificationService.js'; @@ -25,7 +25,7 @@ export const paramDef = { endpoint: { type: 'string' }, }, required: ['endpoint'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/sw/update-registration.ts b/packages/backend/src/server/api/endpoints/sw/update-registration.ts index 473c1d8a7f..3e10e3535e 100644 --- a/packages/backend/src/server/api/endpoints/sw/update-registration.ts +++ b/packages/backend/src/server/api/endpoints/sw/update-registration.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { SwSubscriptionsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { PushNotificationService } from '@/core/PushNotificationService.js'; import { ApiError } from '../../error.js'; @@ -54,7 +54,7 @@ export const paramDef = { sendReadMessage: { type: 'boolean' }, }, required: ['endpoint'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/test.ts b/packages/backend/src/server/api/endpoints/test.ts index 314ac7dab6..649c6632c7 100644 --- a/packages/backend/src/server/api/endpoints/test.ts +++ b/packages/backend/src/server/api/endpoints/test.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; export const meta = { tags: ['non-productive'], @@ -54,7 +54,7 @@ export const paramDef = { id: { type: 'string', format: 'misskey:id' }, }, required: ['required'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/username/available.ts b/packages/backend/src/server/api/endpoints/username/available.ts index 8a8b6790b2..d5abf46aca 100644 --- a/packages/backend/src/server/api/endpoints/username/available.ts +++ b/packages/backend/src/server/api/endpoints/username/available.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsedUsernamesRepository, UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { localUsernameSchema } from '@/models/User.js'; import { DI } from '@/di-symbols.js'; import { MetaService } from '@/core/MetaService.js'; @@ -36,7 +36,7 @@ export const paramDef = { username: localUsernameSchema, }, required: ['username'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts index 8ba3314112..64f7a4b29a 100644 --- a/packages/backend/src/server/api/endpoints/users.ts +++ b/packages/backend/src/server/api/endpoints/users.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -44,7 +44,7 @@ export const paramDef = { }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/achievements.ts b/packages/backend/src/server/api/endpoints/users/achievements.ts index bbbb9aefb6..24ce699138 100644 --- a/packages/backend/src/server/api/endpoints/users/achievements.ts +++ b/packages/backend/src/server/api/endpoints/users/achievements.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserProfilesRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -35,7 +35,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts index c1d5354cd8..f198d526fd 100644 --- a/packages/backend/src/server/api/endpoints/users/clips.ts +++ b/packages/backend/src/server/api/endpoints/users/clips.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { ClipsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { ClipEntityService } from '@/core/entities/ClipEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -37,7 +37,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/featured-notes.ts b/packages/backend/src/server/api/endpoints/users/featured-notes.ts index 1d35bef483..4b6b9f2d93 100644 --- a/packages/backend/src/server/api/endpoints/users/featured-notes.ts +++ b/packages/backend/src/server/api/endpoints/users/featured-notes.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; import { FeaturedService } from '@/core/FeaturedService.js'; @@ -40,7 +40,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/flashs.ts b/packages/backend/src/server/api/endpoints/users/flashs.ts index e2f9775d7f..78e816c03b 100644 --- a/packages/backend/src/server/api/endpoints/users/flashs.ts +++ b/packages/backend/src/server/api/endpoints/users/flashs.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { FlashEntityService } from '@/core/entities/FlashEntityService.js'; import type { FlashsRepository } from '@/models/_.js'; @@ -37,7 +37,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; // eslint-disable-next-line import/no-default-export @Injectable() diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts index 62d1c9f950..0e2499602f 100644 --- a/packages/backend/src/server/api/endpoints/users/followers.ts +++ b/packages/backend/src/server/api/endpoints/users/followers.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository, FollowingsRepository, UserProfilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; import { UtilityService } from '@/core/UtilityService.js'; @@ -67,7 +67,7 @@ export const paramDef = { { required: ['userId'] }, { required: ['username', 'host'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts index 731f1e5f89..5af8a796a0 100644 --- a/packages/backend/src/server/api/endpoints/users/following.ts +++ b/packages/backend/src/server/api/endpoints/users/following.ts @@ -9,7 +9,7 @@ import type { UsersRepository, FollowingsRepository, UserProfilesRepository } fr import { birthdaySchema } from '@/models/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { FollowingEntityService } from '@/core/entities/FollowingEntityService.js'; import { UtilityService } from '@/core/UtilityService.js'; @@ -76,7 +76,7 @@ export const paramDef = { { required: ['userId'] }, { required: ['username', 'host'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts index ad87df715d..7f595ddf1e 100644 --- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts +++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { GalleryPostsRepository } from '@/models/_.js'; import { QueryService } from '@/core/QueryService.js'; import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js'; @@ -37,7 +37,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts index 33398b4fe2..10ec21b0fa 100644 --- a/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts +++ b/packages/backend/src/server/api/endpoints/users/get-frequently-replied-users.ts @@ -9,7 +9,7 @@ import { maximum } from '@/misc/prelude/array.js'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { GetterService } from '@/server/api/GetterService.js'; @@ -58,7 +58,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts index ddc743d414..1cfe5ad47b 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts @@ -9,7 +9,7 @@ import { IdService } from '@/core/IdService.js'; import type { MiUserList } from '@/models/UserList.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -71,7 +71,7 @@ export const paramDef = { listId: { type: 'string', format: 'misskey:id' }, }, required: ['name', 'listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/lists/create.ts b/packages/backend/src/server/api/endpoints/users/lists/create.ts index 61707fb9c4..51b87a50c1 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/create.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/create.ts @@ -9,7 +9,7 @@ import { IdService } from '@/core/IdService.js'; import type { MiUserList } from '@/models/UserList.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '@/server/api/error.js'; @@ -47,7 +47,7 @@ export const paramDef = { name: { type: 'string', minLength: 1, maxLength: 100 }, }, required: ['name'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/lists/delete.ts b/packages/backend/src/server/api/endpoints/users/lists/delete.ts index 2278b57c52..56eb73cff7 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/delete.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/delete.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserListsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -35,7 +35,7 @@ export const paramDef = { listId: { type: 'string', format: 'misskey:id' }, }, required: ['listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts index f248faa827..034578e92a 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserListFavoritesRepository, UserListsRepository } from '@/models/_.js'; import { IdService } from '@/core/IdService.js'; import { ApiError } from '@/server/api/error.js'; @@ -36,7 +36,7 @@ export const paramDef = { listId: { type: 'string', format: 'misskey:id' }, }, required: ['listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() // eslint-disable-next-line import/no-default-export export default class extends Endpoint { diff --git a/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts b/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts index 5fcb42e15d..57b413250c 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/get-memberships.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserListsRepository, UserListFavoritesRepository, UserListMembershipsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; import { QueryService } from '@/core/QueryService.js'; @@ -68,7 +68,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() // eslint-disable-next-line import/no-default-export export default class extends Endpoint { diff --git a/packages/backend/src/server/api/endpoints/users/lists/list.ts b/packages/backend/src/server/api/endpoints/users/lists/list.ts index ecc245c974..ae0d756bf4 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/list.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/list.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserListsRepository, UsersRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { ApiError } from '@/server/api/error.js'; import { DI } from '@/di-symbols.js'; @@ -55,7 +55,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() // eslint-disable-next-line import/no-default-export export default class extends Endpoint { diff --git a/packages/backend/src/server/api/endpoints/users/lists/pull.ts b/packages/backend/src/server/api/endpoints/users/lists/pull.ts index 1d7fe63233..6d969ab945 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/pull.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/pull.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserListsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; import { UserListService } from '@/core/UserListService.js'; @@ -46,7 +46,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['listId', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/lists/push.ts b/packages/backend/src/server/api/endpoints/users/lists/push.ts index d2dd13c1ee..c2477996f2 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/push.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/push.ts @@ -8,7 +8,7 @@ import ms from 'ms'; import type { UserListsRepository, UserListMembershipsRepository, BlockingsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { UserListService } from '@/core/UserListService.js'; import { DI } from '@/di-symbols.js'; @@ -70,7 +70,7 @@ export const paramDef = { userId: { type: 'string', format: 'misskey:id' }, }, required: ['listId', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/lists/show.ts b/packages/backend/src/server/api/endpoints/users/lists/show.ts index 255a8342b1..9947301e3e 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/show.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/show.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserListsRepository, UserListFavoritesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -43,7 +43,7 @@ export const paramDef = { forPublic: { type: 'boolean', default: false }, }, required: ['listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() // eslint-disable-next-line import/no-default-export export default class extends Endpoint { diff --git a/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts b/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts index 3031bb52a5..4385bf0add 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/unfavorite.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import type { UserListFavoritesRepository, UserListsRepository } from '@/models/_.js'; import { ApiError } from '@/server/api/error.js'; import { DI } from '@/di-symbols.js'; @@ -35,7 +35,7 @@ export const paramDef = { listId: { type: 'string', format: 'misskey:id' }, }, required: ['listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() // eslint-disable-next-line import/no-default-export export default class extends Endpoint { diff --git a/packages/backend/src/server/api/endpoints/users/lists/update-membership.ts b/packages/backend/src/server/api/endpoints/users/lists/update-membership.ts index 2246cb6a70..702cee8584 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/update-membership.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/update-membership.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserListsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { DI } from '@/di-symbols.js'; import { UserListService } from '@/core/UserListService.js'; @@ -45,7 +45,7 @@ export const paramDef = { withReplies: { type: 'boolean' }, }, required: ['listId', 'userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/lists/update.ts b/packages/backend/src/server/api/endpoints/users/lists/update.ts index 21b04a403a..66b5d55a2b 100644 --- a/packages/backend/src/server/api/endpoints/users/lists/update.ts +++ b/packages/backend/src/server/api/endpoints/users/lists/update.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserListsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserListEntityService } from '@/core/entities/UserListEntityService.js'; import { DI } from '@/di-symbols.js'; import { ApiError } from '../../../error.js'; @@ -44,7 +44,7 @@ export const paramDef = { isPublic: { type: 'boolean' }, }, required: ['listId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index 85ba1ed4b5..47d5d45a10 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { NotesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { DI } from '@/di-symbols.js'; import { CacheService } from '@/core/CacheService.js'; @@ -64,7 +64,7 @@ export const paramDef = { withFiles: { type: 'boolean', default: false }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts index 526390e99b..01be4864dc 100644 --- a/packages/backend/src/server/api/endpoints/users/pages.ts +++ b/packages/backend/src/server/api/endpoints/users/pages.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { PageEntityService } from '@/core/entities/PageEntityService.js'; import type { PagesRepository } from '@/models/_.js'; @@ -37,7 +37,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts index 13e25bc9f3..c257f03d83 100644 --- a/packages/backend/src/server/api/endpoints/users/reactions.ts +++ b/packages/backend/src/server/api/endpoints/users/reactions.ts @@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UserProfilesRepository, NoteReactionsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { NoteReactionEntityService } from '@/core/entities/NoteReactionEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -59,7 +59,7 @@ export const paramDef = { untilDate: { type: 'integer' }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts index 4a07eaf71e..50fe328db7 100644 --- a/packages/backend/src/server/api/endpoints/users/recommendation.ts +++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts @@ -8,7 +8,7 @@ import { Inject, Injectable } from '@nestjs/common'; import type { UsersRepository, FollowingsRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { QueryService } from '@/core/QueryService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { offset: { type: 'integer', default: 0 }, }, required: [], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/relation.ts b/packages/backend/src/server/api/endpoints/users/relation.ts index 84e140b33b..d160d3394e 100644 --- a/packages/backend/src/server/api/endpoints/users/relation.ts +++ b/packages/backend/src/server/api/endpoints/users/relation.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; export const meta = { @@ -126,7 +126,7 @@ export const paramDef = { }, }, required: ['userId'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/report-abuse.ts b/packages/backend/src/server/api/endpoints/users/report-abuse.ts index 64d034cb53..8b7a082489 100644 --- a/packages/backend/src/server/api/endpoints/users/report-abuse.ts +++ b/packages/backend/src/server/api/endpoints/users/report-abuse.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { GetterService } from '@/server/api/GetterService.js'; import { RoleService } from '@/core/RoleService.js'; import { AbuseReportService } from '@/core/AbuseReportService.js'; @@ -48,7 +48,7 @@ export const paramDef = { comment: { type: 'string', minLength: 1, maxLength: 2048 }, }, required: ['userId', 'comment'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts index 9162130e0b..6afb969837 100644 --- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts +++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserSearchService } from '@/core/UserSearchService.js'; export const meta = { @@ -40,7 +40,7 @@ export const paramDef = { { required: ['username'] }, { required: ['host'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts index aa4476bf9a..dde5fa114e 100644 --- a/packages/backend/src/server/api/endpoints/users/search.ts +++ b/packages/backend/src/server/api/endpoints/users/search.ts @@ -9,7 +9,7 @@ import type { UsersRepository, UserProfilesRepository } from '@/models/_.js'; import type { MiUser } from '@/models/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; import { sqlLikeEscape } from '@/misc/sql-like-escape.js'; @@ -42,7 +42,7 @@ export const paramDef = { detail: { type: 'boolean', default: true }, }, required: ['query'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts index e19567936e..0e8eb84dff 100644 --- a/packages/backend/src/server/api/endpoints/users/show.ts +++ b/packages/backend/src/server/api/endpoints/users/show.ts @@ -9,7 +9,7 @@ import type { UsersRepository } from '@/models/_.js'; import type { MiUser } from '@/models/User.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js'; import { DI } from '@/di-symbols.js'; @@ -79,7 +79,7 @@ export const paramDef = { { required: ['userIds'] }, { required: ['username'] }, ], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export diff --git a/packages/backend/src/server/api/endpoints/users/update-memo.ts b/packages/backend/src/server/api/endpoints/users/update-memo.ts index fe70e1dfc3..5481cac425 100644 --- a/packages/backend/src/server/api/endpoints/users/update-memo.ts +++ b/packages/backend/src/server/api/endpoints/users/update-memo.ts @@ -6,7 +6,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { IEndpointMeta } from '@/server/api/endpoints.js'; -import type { Schema } from '@/misc/json-schema.js'; +import type { ValidatableSchema } from '@/misc/json-schema.js'; import { IdService } from '@/core/IdService.js'; import type { UserMemoRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; @@ -40,7 +40,7 @@ export const paramDef = { }, }, required: ['userId', 'memo'], -} as const satisfies Schema; +} as const satisfies ValidatableSchema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export