From 2898add86a3010b50c20169bffd4361d56fe9a2d Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sat, 7 Sep 2024 01:10:04 +0900 Subject: [PATCH] Revert "replace Schema with ValidatableSchema" This reverts commit d05b65f4033ebb16dafc20ed73b015cdc65fe96b. --- .../admin/abuse-report/notification-recipient/create.ts | 4 ++-- .../admin/abuse-report/notification-recipient/delete.ts | 4 ++-- .../admin/abuse-report/notification-recipient/list.ts | 4 ++-- .../admin/abuse-report/notification-recipient/show.ts | 4 ++-- .../admin/abuse-report/notification-recipient/update.ts | 4 ++-- .../src/server/api/endpoints/admin/abuse-user-reports.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/accounts/create.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/accounts/delete.ts | 4 ++-- .../src/server/api/endpoints/admin/accounts/find-by-email.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/ad/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/ad/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/ad/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/ad/update.ts | 4 ++-- .../src/server/api/endpoints/admin/announcements/create.ts | 4 ++-- .../src/server/api/endpoints/admin/announcements/delete.ts | 4 ++-- .../src/server/api/endpoints/admin/announcements/list.ts | 4 ++-- .../src/server/api/endpoints/admin/announcements/update.ts | 4 ++-- .../server/api/endpoints/admin/avatar-decorations/create.ts | 4 ++-- .../server/api/endpoints/admin/avatar-decorations/delete.ts | 4 ++-- .../src/server/api/endpoints/admin/avatar-decorations/list.ts | 4 ++-- .../server/api/endpoints/admin/avatar-decorations/update.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/delete-account.ts | 4 ++-- .../server/api/endpoints/admin/delete-all-files-of-a-user.ts | 4 ++-- .../server/api/endpoints/admin/drive/clean-remote-files.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/drive/cleanup.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/drive/files.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/drive/show-file.ts | 4 ++-- .../src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/emoji/add.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/emoji/copy.ts | 4 ++-- .../src/server/api/endpoints/admin/emoji/delete-bulk.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/emoji/delete.ts | 4 ++-- .../src/server/api/endpoints/admin/emoji/import-zip.ts | 4 ++-- .../src/server/api/endpoints/admin/emoji/list-remote.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/emoji/list.ts | 4 ++-- .../server/api/endpoints/admin/emoji/remove-aliases-bulk.ts | 4 ++-- .../src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts | 4 ++-- .../src/server/api/endpoints/admin/emoji/set-category-bulk.ts | 4 ++-- .../src/server/api/endpoints/admin/emoji/set-license-bulk.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/emoji/update.ts | 4 ++-- .../server/api/endpoints/admin/federation/delete-all-files.ts | 4 ++-- .../admin/federation/refresh-remote-instance-metadata.ts | 4 ++-- .../api/endpoints/admin/federation/remove-all-following.ts | 4 ++-- .../server/api/endpoints/admin/federation/update-instance.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/get-index-stats.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/get-table-stats.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/get-user-ips.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/invite/create.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/invite/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/meta.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/promo/create.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/queue/clear.ts | 4 ++-- .../src/server/api/endpoints/admin/queue/deliver-delayed.ts | 4 ++-- .../src/server/api/endpoints/admin/queue/inbox-delayed.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/queue/promote.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/queue/stats.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/relays/add.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/relays/list.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/relays/remove.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/reset-password.ts | 4 ++-- .../server/api/endpoints/admin/resolve-abuse-user-report.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/roles/assign.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/roles/create.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/roles/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/roles/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/roles/show.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/roles/unassign.ts | 4 ++-- .../api/endpoints/admin/roles/update-default-policies.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/roles/update.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/roles/users.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/send-email.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/server-info.ts | 4 ++-- .../src/server/api/endpoints/admin/show-moderation-logs.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/show-user.ts | 4 ++-- packages/backend/src/server/api/endpoints/admin/show-users.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/suspend-user.ts | 4 ++-- .../src/server/api/endpoints/admin/system-webhook/create.ts | 4 ++-- .../src/server/api/endpoints/admin/system-webhook/delete.ts | 4 ++-- .../src/server/api/endpoints/admin/system-webhook/list.ts | 4 ++-- .../src/server/api/endpoints/admin/system-webhook/show.ts | 4 ++-- .../src/server/api/endpoints/admin/system-webhook/update.ts | 4 ++-- .../src/server/api/endpoints/admin/unset-user-avatar.ts | 4 ++-- .../src/server/api/endpoints/admin/unset-user-banner.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/unsuspend-user.ts | 4 ++-- .../backend/src/server/api/endpoints/admin/update-meta.ts | 4 ++-- .../src/server/api/endpoints/admin/update-user-note.ts | 4 ++-- packages/backend/src/server/api/endpoints/announcements.ts | 4 ++-- .../backend/src/server/api/endpoints/announcements/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/antennas/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/antennas/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/antennas/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/antennas/notes.ts | 4 ++-- packages/backend/src/server/api/endpoints/antennas/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/antennas/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/ap/get.ts | 4 ++-- packages/backend/src/server/api/endpoints/ap/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/app/create.ts | 2 +- packages/backend/src/server/api/endpoints/app/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/auth/accept.ts | 4 ++-- .../backend/src/server/api/endpoints/auth/session/generate.ts | 4 ++-- .../backend/src/server/api/endpoints/auth/session/show.ts | 4 ++-- .../backend/src/server/api/endpoints/auth/session/userkey.ts | 4 ++-- packages/backend/src/server/api/endpoints/blocking/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/blocking/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/blocking/list.ts | 4 ++-- .../backend/src/server/api/endpoints/bubble-game/ranking.ts | 4 ++-- .../backend/src/server/api/endpoints/bubble-game/register.ts | 4 ++-- packages/backend/src/server/api/endpoints/channels/create.ts | 4 ++-- .../backend/src/server/api/endpoints/channels/favorite.ts | 4 ++-- .../backend/src/server/api/endpoints/channels/featured.ts | 4 ++-- packages/backend/src/server/api/endpoints/channels/follow.ts | 4 ++-- .../backend/src/server/api/endpoints/channels/followed.ts | 4 ++-- .../backend/src/server/api/endpoints/channels/my-favorites.ts | 4 ++-- packages/backend/src/server/api/endpoints/channels/owned.ts | 4 ++-- packages/backend/src/server/api/endpoints/channels/search.ts | 4 ++-- packages/backend/src/server/api/endpoints/channels/show.ts | 4 ++-- .../backend/src/server/api/endpoints/channels/timeline.ts | 4 ++-- .../backend/src/server/api/endpoints/channels/unfavorite.ts | 4 ++-- .../backend/src/server/api/endpoints/channels/unfollow.ts | 4 ++-- packages/backend/src/server/api/endpoints/channels/update.ts | 4 ++-- .../backend/src/server/api/endpoints/charts/active-users.ts | 4 ++-- .../backend/src/server/api/endpoints/charts/ap-request.ts | 4 ++-- packages/backend/src/server/api/endpoints/charts/drive.ts | 4 ++-- .../backend/src/server/api/endpoints/charts/federation.ts | 4 ++-- packages/backend/src/server/api/endpoints/charts/instance.ts | 4 ++-- packages/backend/src/server/api/endpoints/charts/notes.ts | 4 ++-- .../backend/src/server/api/endpoints/charts/user/drive.ts | 4 ++-- .../backend/src/server/api/endpoints/charts/user/following.ts | 4 ++-- .../backend/src/server/api/endpoints/charts/user/notes.ts | 4 ++-- packages/backend/src/server/api/endpoints/charts/user/pv.ts | 4 ++-- .../backend/src/server/api/endpoints/charts/user/reactions.ts | 4 ++-- packages/backend/src/server/api/endpoints/charts/users.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/add-note.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/favorite.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/list.ts | 4 ++-- .../backend/src/server/api/endpoints/clips/my-favorites.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/notes.ts | 4 ++-- .../backend/src/server/api/endpoints/clips/remove-note.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/unfavorite.ts | 4 ++-- packages/backend/src/server/api/endpoints/clips/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/drive.ts | 4 ++-- packages/backend/src/server/api/endpoints/drive/files.ts | 4 ++-- .../src/server/api/endpoints/drive/files/attached-notes.ts | 4 ++-- .../src/server/api/endpoints/drive/files/check-existence.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/files/create.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/files/delete.ts | 4 ++-- .../src/server/api/endpoints/drive/files/find-by-hash.ts | 4 ++-- packages/backend/src/server/api/endpoints/drive/files/find.ts | 4 ++-- packages/backend/src/server/api/endpoints/drive/files/show.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/files/update.ts | 4 ++-- .../src/server/api/endpoints/drive/files/upload-from-url.ts | 4 ++-- packages/backend/src/server/api/endpoints/drive/folders.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/folders/create.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/folders/delete.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/folders/find.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/folders/show.ts | 4 ++-- .../backend/src/server/api/endpoints/drive/folders/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/drive/stream.ts | 4 ++-- .../src/server/api/endpoints/email-address/available.ts | 4 ++-- packages/backend/src/server/api/endpoints/emoji.ts | 4 ++-- packages/backend/src/server/api/endpoints/emojis.ts | 4 ++-- packages/backend/src/server/api/endpoints/endpoint.ts | 4 ++-- packages/backend/src/server/api/endpoints/endpoints.ts | 4 ++-- .../backend/src/server/api/endpoints/export-custom-emojis.ts | 4 ++-- .../backend/src/server/api/endpoints/federation/followers.ts | 4 ++-- .../backend/src/server/api/endpoints/federation/following.ts | 4 ++-- .../backend/src/server/api/endpoints/federation/instances.ts | 4 ++-- .../src/server/api/endpoints/federation/show-instance.ts | 4 ++-- packages/backend/src/server/api/endpoints/federation/stats.ts | 4 ++-- .../src/server/api/endpoints/federation/update-remote-user.ts | 4 ++-- packages/backend/src/server/api/endpoints/federation/users.ts | 4 ++-- .../src/server/api/endpoints/fetch-external-resources.ts | 4 ++-- packages/backend/src/server/api/endpoints/fetch-rss.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/featured.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/like.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/my-likes.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/my.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/unlike.ts | 4 ++-- packages/backend/src/server/api/endpoints/flash/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/following/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/following/delete.ts | 4 ++-- .../backend/src/server/api/endpoints/following/invalidate.ts | 4 ++-- .../src/server/api/endpoints/following/requests/accept.ts | 4 ++-- .../src/server/api/endpoints/following/requests/cancel.ts | 4 ++-- .../src/server/api/endpoints/following/requests/list.ts | 4 ++-- .../src/server/api/endpoints/following/requests/reject.ts | 4 ++-- .../backend/src/server/api/endpoints/following/update-all.ts | 4 ++-- packages/backend/src/server/api/endpoints/following/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/gallery/featured.ts | 4 ++-- packages/backend/src/server/api/endpoints/gallery/popular.ts | 4 ++-- packages/backend/src/server/api/endpoints/gallery/posts.ts | 4 ++-- .../backend/src/server/api/endpoints/gallery/posts/create.ts | 4 ++-- .../backend/src/server/api/endpoints/gallery/posts/delete.ts | 4 ++-- .../backend/src/server/api/endpoints/gallery/posts/like.ts | 4 ++-- .../backend/src/server/api/endpoints/gallery/posts/show.ts | 4 ++-- .../backend/src/server/api/endpoints/gallery/posts/unlike.ts | 4 ++-- .../backend/src/server/api/endpoints/gallery/posts/update.ts | 4 ++-- .../src/server/api/endpoints/get-avatar-decorations.ts | 4 ++-- .../src/server/api/endpoints/get-online-users-count.ts | 4 ++-- packages/backend/src/server/api/endpoints/hashtags/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/hashtags/search.ts | 4 ++-- packages/backend/src/server/api/endpoints/hashtags/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/hashtags/trend.ts | 4 ++-- packages/backend/src/server/api/endpoints/hashtags/users.ts | 4 ++-- packages/backend/src/server/api/endpoints/i.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/2fa/done.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/2fa/key-done.ts | 4 ++-- .../backend/src/server/api/endpoints/i/2fa/password-less.ts | 4 ++-- .../backend/src/server/api/endpoints/i/2fa/register-key.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/2fa/register.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/2fa/unregister.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/2fa/update-key.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/apps.ts | 4 ++-- .../backend/src/server/api/endpoints/i/authorized-apps.ts | 4 ++-- .../backend/src/server/api/endpoints/i/change-password.ts | 4 ++-- .../backend/src/server/api/endpoints/i/claim-achievement.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/delete-account.ts | 4 ++-- .../backend/src/server/api/endpoints/i/export-antennas.ts | 4 ++-- .../backend/src/server/api/endpoints/i/export-blocking.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/export-clips.ts | 4 ++-- .../backend/src/server/api/endpoints/i/export-favorites.ts | 4 ++-- .../backend/src/server/api/endpoints/i/export-following.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/export-mute.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/export-notes.ts | 4 ++-- .../backend/src/server/api/endpoints/i/export-user-lists.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/favorites.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/gallery/likes.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/gallery/posts.ts | 4 ++-- .../backend/src/server/api/endpoints/i/import-antennas.ts | 4 ++-- .../backend/src/server/api/endpoints/i/import-blocking.ts | 4 ++-- .../backend/src/server/api/endpoints/i/import-following.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/import-muting.ts | 4 ++-- .../backend/src/server/api/endpoints/i/import-user-lists.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/move.ts | 4 ++-- .../src/server/api/endpoints/i/notifications-grouped.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/notifications.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/page-likes.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/pages.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/pin.ts | 4 ++-- .../src/server/api/endpoints/i/read-all-unread-notes.ts | 4 ++-- .../backend/src/server/api/endpoints/i/read-announcement.ts | 4 ++-- .../backend/src/server/api/endpoints/i/regenerate-token.ts | 4 ++-- .../backend/src/server/api/endpoints/i/registry/get-all.ts | 4 ++-- .../backend/src/server/api/endpoints/i/registry/get-detail.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/registry/get.ts | 4 ++-- .../src/server/api/endpoints/i/registry/keys-with-type.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/registry/keys.ts | 4 ++-- .../backend/src/server/api/endpoints/i/registry/remove.ts | 4 ++-- .../src/server/api/endpoints/i/registry/scopes-with-domain.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/registry/set.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/revoke-token.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/signin-history.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/unpin.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/update-email.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/update.ts | 4 ++-- .../backend/src/server/api/endpoints/i/webhooks/create.ts | 4 ++-- .../backend/src/server/api/endpoints/i/webhooks/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/webhooks/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/i/webhooks/show.ts | 4 ++-- .../backend/src/server/api/endpoints/i/webhooks/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/invite/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/invite/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/invite/limit.ts | 4 ++-- packages/backend/src/server/api/endpoints/invite/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/meta.ts | 4 ++-- packages/backend/src/server/api/endpoints/miauth/gen-token.ts | 4 ++-- packages/backend/src/server/api/endpoints/mute/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/mute/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/mute/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/my/apps.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/children.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/clips.ts | 4 ++-- .../backend/src/server/api/endpoints/notes/conversation.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/delete.ts | 4 ++-- .../src/server/api/endpoints/notes/favorites/create.ts | 4 ++-- .../src/server/api/endpoints/notes/favorites/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/featured.ts | 4 ++-- .../backend/src/server/api/endpoints/notes/global-timeline.ts | 4 ++-- .../backend/src/server/api/endpoints/notes/hybrid-timeline.ts | 4 ++-- .../backend/src/server/api/endpoints/notes/local-timeline.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/mentions.ts | 4 ++-- .../src/server/api/endpoints/notes/polls/recommendation.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/polls/vote.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/reactions.ts | 4 ++-- .../src/server/api/endpoints/notes/reactions/create.ts | 4 ++-- .../src/server/api/endpoints/notes/reactions/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/renotes.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/replies.ts | 4 ++-- .../backend/src/server/api/endpoints/notes/search-by-tag.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/search.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/state.ts | 4 ++-- .../src/server/api/endpoints/notes/thread-muting/create.ts | 4 ++-- .../src/server/api/endpoints/notes/thread-muting/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/timeline.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/translate.ts | 4 ++-- packages/backend/src/server/api/endpoints/notes/unrenote.ts | 4 ++-- .../src/server/api/endpoints/notes/user-list-timeline.ts | 4 ++-- .../backend/src/server/api/endpoints/notifications/create.ts | 4 ++-- .../backend/src/server/api/endpoints/notifications/flush.ts | 4 ++-- .../server/api/endpoints/notifications/mark-all-as-read.ts | 4 ++-- .../server/api/endpoints/notifications/test-notification.ts | 4 ++-- packages/backend/src/server/api/endpoints/page-push.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/create.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/featured.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/like.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/unlike.ts | 4 ++-- packages/backend/src/server/api/endpoints/pages/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/ping.ts | 4 ++-- packages/backend/src/server/api/endpoints/pinned-users.ts | 4 ++-- packages/backend/src/server/api/endpoints/promo/read.ts | 4 ++-- .../backend/src/server/api/endpoints/renote-mute/create.ts | 4 ++-- .../backend/src/server/api/endpoints/renote-mute/delete.ts | 4 ++-- packages/backend/src/server/api/endpoints/renote-mute/list.ts | 4 ++-- .../src/server/api/endpoints/request-reset-password.ts | 4 ++-- packages/backend/src/server/api/endpoints/reset-db.ts | 4 ++-- packages/backend/src/server/api/endpoints/reset-password.ts | 4 ++-- packages/backend/src/server/api/endpoints/retention.ts | 4 ++-- .../backend/src/server/api/endpoints/reversi/cancel-match.ts | 4 ++-- packages/backend/src/server/api/endpoints/reversi/games.ts | 4 ++-- .../backend/src/server/api/endpoints/reversi/invitations.ts | 4 ++-- packages/backend/src/server/api/endpoints/reversi/match.ts | 4 ++-- .../backend/src/server/api/endpoints/reversi/show-game.ts | 4 ++-- .../backend/src/server/api/endpoints/reversi/surrender.ts | 4 ++-- packages/backend/src/server/api/endpoints/reversi/verify.ts | 4 ++-- packages/backend/src/server/api/endpoints/roles/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/roles/notes.ts | 4 ++-- packages/backend/src/server/api/endpoints/roles/show.ts | 4 ++-- packages/backend/src/server/api/endpoints/roles/users.ts | 4 ++-- packages/backend/src/server/api/endpoints/server-info.ts | 4 ++-- packages/backend/src/server/api/endpoints/stats.ts | 4 ++-- packages/backend/src/server/api/endpoints/sw/register.ts | 2 +- .../backend/src/server/api/endpoints/sw/show-registration.ts | 4 ++-- packages/backend/src/server/api/endpoints/sw/unregister.ts | 4 ++-- .../src/server/api/endpoints/sw/update-registration.ts | 4 ++-- packages/backend/src/server/api/endpoints/test.ts | 4 ++-- .../backend/src/server/api/endpoints/username/available.ts | 4 ++-- packages/backend/src/server/api/endpoints/users.ts | 4 ++-- .../backend/src/server/api/endpoints/users/achievements.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/clips.ts | 4 ++-- .../backend/src/server/api/endpoints/users/featured-notes.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/flashs.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/followers.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/following.ts | 4 ++-- .../backend/src/server/api/endpoints/users/gallery/posts.ts | 4 ++-- .../api/endpoints/users/get-frequently-replied-users.ts | 4 ++-- .../server/api/endpoints/users/lists/create-from-public.ts | 4 ++-- .../backend/src/server/api/endpoints/users/lists/create.ts | 4 ++-- .../backend/src/server/api/endpoints/users/lists/delete.ts | 4 ++-- .../backend/src/server/api/endpoints/users/lists/favorite.ts | 4 ++-- .../src/server/api/endpoints/users/lists/get-memberships.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/lists/list.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/lists/pull.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/lists/push.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/lists/show.ts | 4 ++-- .../src/server/api/endpoints/users/lists/unfavorite.ts | 4 ++-- .../src/server/api/endpoints/users/lists/update-membership.ts | 4 ++-- .../backend/src/server/api/endpoints/users/lists/update.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/notes.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/pages.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/reactions.ts | 4 ++-- .../backend/src/server/api/endpoints/users/recommendation.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/relation.ts | 4 ++-- .../backend/src/server/api/endpoints/users/report-abuse.ts | 4 ++-- .../server/api/endpoints/users/search-by-username-and-host.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/search.ts | 4 ++-- packages/backend/src/server/api/endpoints/users/show.ts | 4 ++-- .../backend/src/server/api/endpoints/users/update-memo.ts | 4 ++-- 379 files changed, 756 insertions(+), 756 deletions(-) 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 c1ac5ceea2..137bc45822 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1511ba3b70..4bdac5b70c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8aed481af1..ecec5cef33 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } from '@/misc/json-schema.js'; import { AbuseReportNotificationRecipientEntityService, } from '@/core/entities/AbuseReportNotificationRecipientEntityService.js'; @@ -41,7 +41,7 @@ export const paramDef = { }, }, required: [], -} as const satisfies ValidatableSchema; +} as const satisfies Schema; @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 c192ccbe4a..504233a101 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } from '@/misc/json-schema.js'; import { AbuseReportNotificationRecipientEntityService, } from '@/core/entities/AbuseReportNotificationRecipientEntityService.js'; @@ -46,7 +46,7 @@ export const paramDef = { }, }, required: ['id'], -} as const satisfies ValidatableSchema; +} as const satisfies Schema; @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 9cd455c402..ce8818b99d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 35907183d9..0cc883a260 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d5fa92a73d..73ad834794 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 53e202aedd..fe7f014f4e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d630d582ba..2cc0783e1b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 61fcc8a3ae..967d6515bf 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2fb0fdab38..8f388bcaf7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 591cf070c7..13b55391cc 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ba24da788c..06457704d8 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fbc9d76562..5a64d04672 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 13c58afb06..bf49cf81d7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b9d02098f0..bcc4a98a11 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 bf9ed3c4f9..b9bebcc4d9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 25e1b27778..ef2b729988 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0b3f892a9e..1de2ed3c4e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f7b7684a75..b78235b2bd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fb1ce0ecb5..e9e4645078 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 91729c6a53..1f76368022 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 86f72c60c6..25ae2418e7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c9716bae3f..d0cf6c078f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d8e61b0997..8b8cf4f5e9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 eb52729450..493a777730 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1e9faaa3df..b75951cb46 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8d57737afb..c25393a82e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7cecdd7ef9..55524e33d8 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 f9d234d2ca..619d712625 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 aa064edc48..74ec981816 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7c4e77db11..f6d24b08f0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 25a22921ab..765fb84769 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 27b1bdac3f..7207a2694f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0d49b2f5aa..37c7cd9553 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 605ca59e03..d4d4787c4f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 dd2376e021..35922994a3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 02a70bd952..68be6aeb5e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c63faeaec8..e65753a44a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b53ac569f3..d930ffd2e9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 83d1295269..3c51a1cfe0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 74f51a03e9..05bbce9814 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fb815f7b36..e5d9fc80cd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 62247aa5ed..ceb81a46a9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 02ee373750..3de96adf87 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 3645fbdc29..c5bfa1f2ab 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fd1fcba5b3..2155f90711 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 61c4794ba3..f4f5aae065 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 294974e15f..11113c7ac5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 195c0190c2..072c3e99f1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 3b09493866..5915139862 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 37ef81dd82..7abc3028d0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b2e824f30a..f2cb7db539 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 308649b2cd..750e28f77b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 abe8f9f7e9..9bf5fed0b9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6411cea088..e3f47fc9f4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 561b5e1c03..b461635f0a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a2fa2596e9..31604b16d4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 13f8e2d8ee..f9c9f830d3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e879fe8e5c..f962e45d9a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6d643b283b..fcaffb2061 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0036842dfb..528da7c596 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fe2112b264..686d307cf3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 83727c7df5..16a51a08f5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e30e106b91..9166a79f71 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 68903fdc53..774506a087 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 84db86f0e8..80a3b594df 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0a948922c1..a494c71f89 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 46ef21411c..d05b6c7978 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 276dc49632..f2b38d8cd8 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b64c7d4205..947a706a20 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a67f161c9e..372d7e094a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4623345a8f..95d8e1521f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e77e2164fb..88fc405527 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f2f22bde8e..496d8ab006 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6b541073c8..8babc43b10 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 28d92179a1..057191850d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b6c2637172..175659f867 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 223a23fd21..e7f0c10b23 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e46ac01d04..43e976338c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 951e230a7c..c6216938ac 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f0f199dc5f..0ad6546241 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 1c4fb7dfec..cd359e22af 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 102f787394..e6a94a8e64 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 911c3f5bfb..0bae985215 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ef5d052e87..8438e03167 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6b761343d8..672fe050d0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c51d31da4f..dfc1510410 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f585f6630a..44229fd7e9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6eafaa79e9..ebb3002af2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 15fd4f8554..dfe7c0b4b9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ba649a5b55..aea140806e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2ba21e32c6..9c2aacfef9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a8376bffd9..b41ee423d4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 be30b7e8d1..38c795b361 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ff5ffb3bb4..f2edb14222 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 30729bc723..7ace305e25 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema, 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 f76fd7a108..7365b5d85e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 de55265270..808d8677ce 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c25ca9a7c7..c36dd074ad 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 19f7cd4b05..9aa093a7a2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 704bff5e24..81e00a0fa4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 9c961d4bbe..20afeed526 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 71f168841a..a5d02c8477 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 46d2ec2c03..7eb151ff18 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b5a5bea1ef..fcc01a35db 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 301b8f5532..a980b67995 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4d9d59df7c..f0ee9862f3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e7e0d30cf9..d21f155120 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5643b525ef..8ec6b5a42a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ecd028a9f1..ee33f79a6f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b2aaa5f5e1..6e970bad2b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e84a7c40d2..12de99f8d9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5a88c85388..88eef61c89 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c15ec5e85f..062d4d5565 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 192af48a3c..8c049c92b6 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e32d5baa87..85c16927e5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d5e10a9420..0d9f33fa43 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5d68dabdc2..3f2758f233 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7ec7beb6c8..7d5a87204f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e63184e409..5c9f537dda 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 81fb37ca40..c08fcbf2d8 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c0c0446b7a..597ea3f57d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2254753688..6579804ba2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d4689d278c..f9f69c4797 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7507c1e5eb..b33b4b42b0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 532b5d08a1..efea13bd21 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7e2b190c7d..d55e25359e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c2f541fd9c..2dfeda3f3b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4cb696e0e2..be4debe289 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 54bddc73f5..fa75caf0e2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7102ba750e..cfe42f4bc7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fde4eb8d13..b3e6f19f6c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2f0c7e7322..aa1f2d409e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 079276ca76..f51ef5df08 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b9491d8d0f..e9d78c3fcd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1717eccacf..a436f684f2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a36d9eabc6..4b050e54c0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4b06b890d3..205d27731a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d799fa5267..5e5d1f95c5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2038d4c18e..8fbc88475d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 efae2e3199..bdb1f1cef5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f4d6bf89c0..5952086808 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 40d55e2723..a668354543 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f6b2abdc63..57cdf9cb6a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7e10754c7f..baf901cdb6 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 de652d6b54..27e53037fd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 19285dfcc4..fbf92f8f9f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 02b34d6d54..cc401bda01 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f96d77ed83..8126953ce3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2e242c3cb7..d476abfee2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b2a47ad6f2..be01259eb9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7662b715c7..4b979ce693 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 3330667a2f..c6ada3167c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 232246c12e..6ef673c83f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 98e1e65384..80fc0b481d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 89a2472b8d..2223e9c33d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 3b93838e3e..31432deb7b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 185a174fdd..247cf8e5c6 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 460aabfb87..efb034a8fa 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fdd7234ce2..44eb6403b4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ae03ea2d4b..7209cd813f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4d88ea0aa7..aacc603e72 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 30341d6d01..f34a81b5e7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e226def33c..a51d10dfb2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 67fdcb77bc..9faaaf8a89 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 211271305f..8c31bbe739 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 69031a8364..b82075d71f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 27b5e900f8..23e44b96de 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 cfe69a5c75..8c4ef9189e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b87e98f285..0614353936 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 040dc74cee..5bdd9d0ac3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 49453e0256..a397adeac0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5ff80a234a..55131cc4e4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 3cd60ddc5d..3fd17ef7d7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d5605640e7..7ffc18c4a5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a749f35bad..9d2c85e949 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 732db4579b..bc85971822 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 445e351cdc..ff13b376ee 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 80d6a804ad..92ee068297 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a1339fa255..d96230b388 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c2c8ff7e80..6cd45f7e0f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 eada6c2119..d3dec140c0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 153122646f..8b5cfe8f20 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0063576a9e..7defde3017 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 fe465c1a06..b42c79efc8 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 09a7b18bea..64ed4da284 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 10192d8546..c12c17d0e2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 db43fb50be..1ee5f2641e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 76fc3be5e5..02931af0ad 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 789f7cc0a8..930ae23417 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a2eed7dbe9..f0d6d6bc45 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c3f76225fb..fbefdc35d5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7c53638d47..00d8b1db37 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f000a9fa86..dda93b4463 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0d9937e165..66863801b5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a1d17a65a3..4a8d35d657 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2710007245..e99e42f392 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 62b648c9ba..95882799d0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 29a2ca7998..b2fbeebb89 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 9314564447..2ffc6e1e86 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 810e27f1fd..6371640e01 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2345fd11b6..3a6f868c8f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 bb72c3d721..7ed22106bd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6534bbd8d1..acd44db473 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e285705a99..ddcbac67d5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2b9d4f3c9f..2ffcd321f1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b80a072d8f..dfddb72ef1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 30e3280988..1b1e326bc0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f919ac7c11..ab44de19f9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e68eb79141..891a9c9340 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 535b4084b9..b6376c30ee 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c1784c3283..eb8ddcadfe 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 33f9f52de3..e80f6fa96c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a3ada93098..685f3084fc 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 9593568abd..dcf1216737 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 bd163586ff..fdd6f2dc21 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 37b6eaa10e..442c8f94f7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 29776c3fc4..ccd9fdb63b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b8932700c1..68569826f2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 aca9d45094..999f2ab26c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0ba8c15748..806f9c8a28 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 88b22bb8be..f7efb5e06b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f9c5cd770b..e5dfd63245 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ff6ea0cf05..b5dbb0dd75 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0d9fe7df38..0ce81cd539 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 eeaeb978cf..d9a06e5a05 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 802dccff06..37f2d5f954 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 287d19c0d8..c9b7798149 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 555a2405af..a4678209cd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6c022b53f1..da14780881 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f88c7047fe..cc46fc3108 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 9ea6fa071a..4ed12973dd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 25c6f297ff..53ef14153b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a906e4612b..c40116ad7d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d18df7a693..67fd8286c2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7ddc30adec..dea4c64dfd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f855cd92fa..c7018c91bd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 31e9ac2e76..6ce29aa8df 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 725cf211b0..1747c19b67 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4bf23b7f75..73414b7e71 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8b9a38a60f..dd1b71583a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1a1a89f2dd..649221685f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 3a35f15196..77983ddbf8 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a2e453334a..eb04dec734 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d936739d1e..71634fa39e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1e2b10a069..d535a891ad 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1bf3f8babd..935f1d55dd 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 174ea66f44..b1a3a45f80 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 78bbac1f9e..af33520770 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 653085052d..9c41674d32 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 52404d6715..a1b27677c2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2f2e4c4706..434071b0e1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 65d971dd03..7f6ccf4d5f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 74808adee3..1345c1c124 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b270e94efc..9e684164f1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0b29d87c45..158ca6eb0c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 46f2cc0018..9862009921 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 027d4bd64e..bba15c97c4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d6375515c2..e90d2a4479 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8ba57cae38..b182b30026 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f02cdfce3f..dc4993be63 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 750a57a309..f5cef0412d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 ff426b897c..ea6305a155 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 3ca35e68f0..6164e0bbca 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 2fec0b91dd..7914d4caea 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 474ca5d566..dfdce26bdc 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/invite/create.ts b/packages/backend/src/server/api/endpoints/invite/create.ts index 14b466c3fa..ecbb69a8ac 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 455cf105f1..aa2e7ec4ec 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 834c8ce03f..0f9203af35 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c9a77ceae6..98bd0064a3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 530662e15c..5b469f5487 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f0add242a7..1c39995da2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e55a244b93..6307ee33f4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 09fc966c5c..9bf96d492b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 aa83f3a471..e386bacc23 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 544df22d39..20270d57b0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8403150e0e..86566a8eaa 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 90ef8a6843..ff5a100d67 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 9dacf7d4e3..bdedda5c9e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 aab3340ed0..5bf840e749 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 abc01352cb..fc75453f9b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 cccb50437b..8096a61f95 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 68313ce20a..03fc1a7e52 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 776dc5581a..5bb7dcc9ed 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8ea4ad31fb..ce4c997121 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 25c81f205b..27e225a06a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 da1ae7a349..49024d48b6 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 173f662410..9fa9c0b262 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 becb744a95..8f7ac3826a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 bb6a5eee22..15fec2f00f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 108df64209..141c089598 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts index 476b600f37..d74a7b28ab 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 411f57dba2..861654f11a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 01499e8b4d..fd60c847cf 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 efb92661dd..c7c66c85c9 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8906875243..0e3fc6cf53 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7b28ee767e..706d6e91c2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 77cc04b8b1..97bc61cd78 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // TODO: ロジックをサービスに切り出す diff --git a/packages/backend/src/server/api/endpoints/notes/show.ts b/packages/backend/src/server/api/endpoints/notes/show.ts index 1b83dbad8c..60a3d71983 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1a0c2c24fb..4c76adcd4f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 99a740edfb..3ae3587786 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 49dcbaa82d..f069510608 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4932995e54..03433cc4f0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 19a979e47c..d19acdd520 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e865460691..38d0213c49 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b0971269dd..8d0442d6bf 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 bb4ece51d7..a727c9c9ae 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 40d3b3fec1..e205a86b96 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 764086b761..0682744caf 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a89f928eed..a08faa885b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 818ec355f4..32dd7f7069 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 dde0d562ac..82d638c98b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0e82561c06..40ce738d61 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 110d3e8cd6..f8e1bc5af7 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7eca863371..89d2a30441 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8adc9fbeb0..4335ec527b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5bd559bbee..6a306dfb52 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 11afd8843f..7edcd4458d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4383e68976..a52759ba0b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } from '@/misc/json-schema.js'; export const meta = { requireCredential: false, @@ -29,7 +29,7 @@ export const paramDef = { type: 'object', properties: {}, required: [], -} as const satisfies ValidatableSchema; +} as const satisfies Schema; @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 06c4dcebe9..a21f268e04 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4332653da0..db2b778fd0 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7973e11e91..bb2c08e148 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b3b3571029..d58cdf64e1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 383edd33b3..7a589056e6 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 acfbe88c23..ee5b0d90cc 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0ea2233ae5..5ecfad0c58 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 593313775a..4c06b53f23 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d69dfe1ae5..940fd106ef 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 92554fa690..fedaccf15b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 b3b0b7525e..1fd63a1758 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 82709f7b52..6a8344e69b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 85b3b897be..cefaf1669e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 df9441e38c..1470682cab 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e0912b9b47..f45f100f50 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5a1ecd9e0b..528ac156e5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 51da402f27..50aa6ade45 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0f8dc1008a..e8be4fac82 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c716dc0789..b4ebb500c5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 aa6f080be2..080aaf3862 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 a61a2c5b2e..6fecd8384c 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 aab91b702e..1fa238bed1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 48757d2016..8b8bef5cdc 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 3778c54bae..29f4d31050 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 e53a008a0c..e1b3036efb 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 3e10e3535e..473c1d8a7f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 649c6632c7..314ac7dab6 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d5abf46aca..8a8b6790b2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 64f7a4b29a..8ba3314112 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 24ce699138..bbbb9aefb6 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 f198d526fd..c1d5354cd8 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4b6b9f2d93..1d35bef483 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 78e816c03b..e2f9775d7f 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; // 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 0e2499602f..62d1c9f950 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5af8a796a0..731f1e5f89 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 7f595ddf1e..ad87df715d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 10ec21b0fa..33398b4fe2 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 1cfe5ad47b..ddc743d414 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 51b87a50c1..61707fb9c4 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 56eb73cff7..2278b57c52 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 034578e92a..f248faa827 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 57b413250c..5fcb42e15d 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 ae0d756bf4..ecc245c974 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6d969ab945..1d7fe63233 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c2477996f2..d2dd13c1ee 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 9947301e3e..255a8342b1 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 4385bf0add..3031bb52a5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 702cee8584..2246cb6a70 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 66b5d55a2b..21b04a403a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 47d5d45a10..85ba1ed4b5 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 01be4864dc..526390e99b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 c257f03d83..13e25bc9f3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 50fe328db7..4a07eaf71e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 d160d3394e..84e140b33b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 8b7a082489..64d034cb53 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 6afb969837..9162130e0b 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 dde5fa114e..aa4476bf9a 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 0e8eb84dff..e19567936e 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @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 5481cac425..fe70e1dfc3 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 { ValidatableSchema } from '@/misc/json-schema.js'; +import type { Schema } 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 ValidatableSchema; +} as const satisfies Schema; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export