From efb0ffc4ec1e0b9f6af922cee11481c28dd9a8d6 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Jan 2022 22:27:10 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20API=E3=82=A8=E3=83=B3=E3=83=89?=
=?UTF-8?q?=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88=E3=83=95=E3=82=A1=E3=82=A4?=
=?UTF-8?q?=E3=83=AB=E3=81=AE=E5=AE=9A=E7=BE=A9=E3=82=92=E8=89=AF=E3=81=84?=
=?UTF-8?q?=E6=84=9F=E3=81=98=E3=81=AB=E3=81=99=E3=82=8B=20(#8154)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Fix API Schema Error
* Delete SimpleSchema/SimpleObj
and Move schemas to dedicated files
* Userã®ã‚¹ã‚ーマを分割ã—ã¦ã¿ã‚‹
* define packMany type
* add ,
* Ensure enum schema and Make "as const" put once
* test?
* Revert "test?"
This reverts commit 97dc9bfa70851bfb7d1cf38e883f8df20fb78b79.
* Revert "Fix API Schema Error"
This reverts commit 21b6176d974ed8e3eb73723ad21a105c5d297323.
* :v:
* clean up
* test?
* wip
* wip
* better schema def
* :v:
* fix
* add minLength property
* wip
* wip
* wip
* anyOf/oneOf/allOfã«å¯¾å¿œï¼Ÿ ~ relation.ts
* refactor!
* Define MinimumSchema
* wip
* wip
* anyOf/oneOf/allOfãŒå‹•ä½œã™ã‚‹ã‚ˆã†ã«UnionSchemaTypeã‚’ä¿®æ£
* anyOf/oneOf/allOfãŒå‹•ä½œã™ã‚‹ã‚ˆã†ã«UnionSchemaTypeã‚’ä¿®æ£
* Update packages/backend/src/misc/schema.ts
Co-authored-by: Acid Chicken (ç¡«é…¸é¶) <root@acid-chicken.com>
* fix
* array oneOfをよりæ£ç¢ºãªåž‹ã«
* array oneOfをよりæ£ç¢ºãªåž‹ã«
* wip
* :v:
* ãªã‚“ã‹ã‚‚ã†ã„ã‚ã„ã‚
* remove
* very good schema
* api schema
* wip
* refactor: awaitAllã®åž‹å®šç¾©ã‚’変ãˆã¦ã¿ã‚‹
* fix
* specify types in awaitAll
* specify types in awaitAll
* :v:
* wip
* ...
* :v:
* AllowDateã¯ã‚„ã‚ã¦ãŠã
* ä¸å¿…è¦ãªoptional: false, nullable: falseを廃æ¢
* PackedãŒå±•é–‹ã•ã‚Œãªã„よã†ã«
* 続packed
* wip
* define note type
* wip
* UserDetailedã‚’MeDetailedã‹UserDetailedNotMeã‹ã‚’区別ã§ãるよã†ã«
* wip
* wip
* wip specify user type of other schemas
* ok
* convertSchemaToOpenApiSchemaを改修
* convertSchemaToOpenApiSchemaを改修
* Fix
* fix
* :v:
* wip
* 分割代入ã§ã¯ãªãallOfã§å®šç¾©ã™ã‚‹ã‚ˆã†ã«
Co-authored-by: Acid Chicken (ç¡«é…¸é¶) <root@acid-chicken.com>
---
packages/backend/src/misc/schema.ts | 171 +++++--
packages/backend/src/misc/simple-schema.ts | 15 -
.../src/models/repositories/antenna.ts | 91 ----
.../backend/src/models/repositories/app.ts | 35 --
.../src/models/repositories/blocking.ts | 28 --
.../src/models/repositories/channel.ts | 53 --
.../backend/src/models/repositories/clip.ts | 39 --
.../src/models/repositories/drive-file.ts | 113 +----
.../src/models/repositories/drive-folder.ts | 41 --
.../backend/src/models/repositories/emoji.ts | 38 --
.../repositories/federation-instance.ts | 104 ----
.../src/models/repositories/following.ts | 38 --
.../src/models/repositories/gallery-post.ts | 71 ---
.../src/models/repositories/hashtag.ts | 36 --
.../models/repositories/messaging-message.ts | 75 ---
.../backend/src/models/repositories/muting.ts | 28 --
.../src/models/repositories/note-favorite.ts | 28 --
.../src/models/repositories/note-reaction.ts | 27 -
.../backend/src/models/repositories/note.ts | 187 +------
.../src/models/repositories/notification.ts | 66 ---
.../backend/src/models/repositories/page.ts | 53 --
.../backend/src/models/repositories/queue.ts | 30 --
.../src/models/repositories/user-group.ts | 36 --
.../src/models/repositories/user-list.ts | 31 --
.../backend/src/models/repositories/user.ts | 348 +------------
packages/backend/src/models/schema/antenna.ts | 89 ++++
packages/backend/src/models/schema/app.ts | 33 ++
.../backend/src/models/schema/blocking.ts | 26 +
packages/backend/src/models/schema/channel.ts | 51 ++
packages/backend/src/models/schema/clip.ts | 38 ++
.../backend/src/models/schema/drive-file.ts | 107 ++++
.../backend/src/models/schema/drive-folder.ts | 39 ++
packages/backend/src/models/schema/emoji.ts | 36 ++
.../src/models/schema/federation-instance.ts | 105 ++++
.../backend/src/models/schema/following.ts | 36 ++
.../backend/src/models/schema/gallery-post.ts | 69 +++
packages/backend/src/models/schema/hashtag.ts | 34 ++
.../src/models/schema/messaging-message.ts | 73 +++
packages/backend/src/models/schema/muting.ts | 26 +
.../src/models/schema/note-favorite.ts | 26 +
.../src/models/schema/note-reaction.ts | 25 +
packages/backend/src/models/schema/note.ts | 183 +++++++
.../backend/src/models/schema/notification.ts | 66 +++
packages/backend/src/models/schema/page.ts | 51 ++
packages/backend/src/models/schema/queue.ts | 25 +
.../backend/src/models/schema/user-group.ts | 34 ++
.../backend/src/models/schema/user-list.ts | 29 ++
packages/backend/src/models/schema/user.ts | 467 ++++++++++++++++++
packages/backend/src/prelude/await-all.ts | 14 +-
packages/backend/src/server/api/endpoints.ts | 44 +-
.../api/endpoints/admin/abuse-user-reports.ts | 52 +-
.../api/endpoints/admin/accounts/create.ts | 10 +-
.../api/endpoints/admin/accounts/delete.ts | 4 +-
.../server/api/endpoints/admin/ad/create.ts | 4 +-
.../server/api/endpoints/admin/ad/delete.ts | 4 +-
.../src/server/api/endpoints/admin/ad/list.ts | 4 +-
.../server/api/endpoints/admin/ad/update.ts | 4 +-
.../endpoints/admin/announcements/create.ts | 32 +-
.../endpoints/admin/announcements/delete.ts | 4 +-
.../api/endpoints/admin/announcements/list.ts | 40 +-
.../endpoints/admin/announcements/update.ts | 4 +-
.../admin/delete-all-files-of-a-user.ts | 4 +-
.../server/api/endpoints/admin/delete-logs.ts | 14 -
.../admin/drive/clean-remote-files.ts | 4 +-
.../api/endpoints/admin/drive/cleanup.ts | 4 +-
.../server/api/endpoints/admin/drive/files.ts | 12 +-
.../api/endpoints/admin/drive/show-file.ts | 112 ++---
.../endpoints/admin/emoji/add-aliases-bulk.ts | 4 +-
.../server/api/endpoints/admin/emoji/add.ts | 4 +-
.../server/api/endpoints/admin/emoji/copy.ts | 12 +-
.../api/endpoints/admin/emoji/delete-bulk.ts | 4 +-
.../api/endpoints/admin/emoji/delete.ts | 4 +-
.../api/endpoints/admin/emoji/import-zip.ts | 4 +-
.../api/endpoints/admin/emoji/list-remote.ts | 40 +-
.../server/api/endpoints/admin/emoji/list.ts | 40 +-
.../admin/emoji/remove-aliases-bulk.ts | 4 +-
.../endpoints/admin/emoji/set-aliases-bulk.ts | 4 +-
.../admin/emoji/set-category-bulk.ts | 4 +-
.../api/endpoints/admin/emoji/update.ts | 4 +-
.../admin/federation/delete-all-files.ts | 4 +-
.../refresh-remote-instance-metadata.ts | 4 +-
.../admin/federation/remove-all-following.ts | 4 +-
.../admin/federation/update-instance.ts | 4 +-
.../api/endpoints/admin/get-index-stats.ts | 4 +-
.../api/endpoints/admin/get-table-stats.ts | 8 +-
.../src/server/api/endpoints/admin/invite.ts | 12 +-
.../api/endpoints/admin/moderators/add.ts | 4 +-
.../api/endpoints/admin/moderators/remove.ts | 4 +-
.../api/endpoints/admin/promo/create.ts | 4 +-
.../server/api/endpoints/admin/queue/clear.ts | 4 +-
.../endpoints/admin/queue/deliver-delayed.ts | 16 +-
.../endpoints/admin/queue/inbox-delayed.ts | 16 +-
.../server/api/endpoints/admin/queue/jobs.ts | 32 +-
.../server/api/endpoints/admin/queue/stats.ts | 12 +-
.../server/api/endpoints/admin/relays/add.ts | 22 +-
.../server/api/endpoints/admin/relays/list.ts | 26 +-
.../api/endpoints/admin/relays/remove.ts | 6 +-
.../api/endpoints/admin/reset-password.ts | 12 +-
.../admin/resolve-abuse-user-report.ts | 4 +-
.../api/endpoints/admin/resync-chart.ts | 4 +-
.../server/api/endpoints/admin/send-email.ts | 4 +-
.../server/api/endpoints/admin/server-info.ts | 64 +--
.../endpoints/admin/show-moderation-logs.ts | 38 +-
.../server/api/endpoints/admin/show-user.ts | 136 ++---
.../server/api/endpoints/admin/show-users.ts | 14 +-
.../api/endpoints/admin/silence-user.ts | 4 +-
.../api/endpoints/admin/suspend-user.ts | 4 +-
.../api/endpoints/admin/unsilence-user.ts | 4 +-
.../api/endpoints/admin/unsuspend-user.ts | 4 +-
.../server/api/endpoints/admin/update-meta.ts | 4 +-
.../src/server/api/endpoints/admin/vacuum.ts | 4 +-
.../src/server/api/endpoints/announcements.ts | 40 +-
.../server/api/endpoints/antennas/create.ts | 8 +-
.../server/api/endpoints/antennas/delete.ts | 4 +-
.../src/server/api/endpoints/antennas/list.ts | 12 +-
.../server/api/endpoints/antennas/notes.ts | 12 +-
.../src/server/api/endpoints/antennas/show.ts | 8 +-
.../server/api/endpoints/antennas/update.ts | 8 +-
.../src/server/api/endpoints/ap/get.ts | 8 +-
.../src/server/api/endpoints/ap/show.ts | 57 ++-
.../src/server/api/endpoints/app/create.ts | 8 +-
.../src/server/api/endpoints/app/show.ts | 12 +-
.../src/server/api/endpoints/auth/accept.ts | 4 +-
.../api/endpoints/auth/session/generate.ts | 16 +-
.../server/api/endpoints/auth/session/show.ts | 20 +-
.../api/endpoints/auth/session/userkey.ts | 18 +-
.../server/api/endpoints/blocking/create.ts | 10 +-
.../server/api/endpoints/blocking/delete.ts | 10 +-
.../src/server/api/endpoints/blocking/list.ts | 12 +-
.../server/api/endpoints/channels/create.ts | 8 +-
.../server/api/endpoints/channels/featured.ts | 12 +-
.../server/api/endpoints/channels/follow.ts | 4 +-
.../server/api/endpoints/channels/followed.ts | 12 +-
.../server/api/endpoints/channels/owned.ts | 12 +-
.../src/server/api/endpoints/channels/show.ts | 8 +-
.../server/api/endpoints/channels/timeline.ts | 12 +-
.../server/api/endpoints/channels/unfollow.ts | 4 +-
.../server/api/endpoints/channels/update.ts | 8 +-
.../api/endpoints/charts/active-users.ts | 2 +-
.../src/server/api/endpoints/charts/drive.ts | 2 +-
.../server/api/endpoints/charts/federation.ts | 2 +-
.../server/api/endpoints/charts/hashtag.ts | 2 +-
.../server/api/endpoints/charts/instance.ts | 2 +-
.../server/api/endpoints/charts/network.ts | 2 +-
.../src/server/api/endpoints/charts/notes.ts | 2 +-
.../server/api/endpoints/charts/user/drive.ts | 2 +-
.../api/endpoints/charts/user/following.ts | 2 +-
.../server/api/endpoints/charts/user/notes.ts | 2 +-
.../api/endpoints/charts/user/reactions.ts | 2 +-
.../src/server/api/endpoints/charts/users.ts | 2 +-
.../server/api/endpoints/clips/add-note.ts | 4 +-
.../src/server/api/endpoints/clips/create.ts | 8 +-
.../src/server/api/endpoints/clips/delete.ts | 4 +-
.../src/server/api/endpoints/clips/list.ts | 12 +-
.../src/server/api/endpoints/clips/notes.ts | 12 +-
.../src/server/api/endpoints/clips/show.ts | 8 +-
.../src/server/api/endpoints/clips/update.ts | 8 +-
.../backend/src/server/api/endpoints/drive.ts | 16 +-
.../src/server/api/endpoints/drive/files.ts | 12 +-
.../endpoints/drive/files/attached-notes.ts | 12 +-
.../endpoints/drive/files/check-existence.ts | 8 +-
.../api/endpoints/drive/files/create.ts | 8 +-
.../api/endpoints/drive/files/delete.ts | 4 +-
.../api/endpoints/drive/files/find-by-hash.ts | 12 +-
.../server/api/endpoints/drive/files/find.ts | 12 +-
.../server/api/endpoints/drive/files/show.ts | 8 +-
.../api/endpoints/drive/files/update.ts | 8 +-
.../endpoints/drive/files/upload-from-url.ts | 4 +-
.../src/server/api/endpoints/drive/folders.ts | 12 +-
.../api/endpoints/drive/folders/create.ts | 4 +-
.../api/endpoints/drive/folders/delete.ts | 4 +-
.../api/endpoints/drive/folders/find.ts | 12 +-
.../api/endpoints/drive/folders/show.ts | 8 +-
.../api/endpoints/drive/folders/update.ts | 8 +-
.../src/server/api/endpoints/drive/stream.ts | 12 +-
.../api/endpoints/email-address/available.ts | 16 +-
.../src/server/api/endpoints/endpoint.ts | 4 +-
.../src/server/api/endpoints/endpoints.ts | 12 +-
.../api/endpoints/export-custom-emojis.ts | 4 +-
.../api/endpoints/federation/followers.ts | 12 +-
.../api/endpoints/federation/following.ts | 12 +-
.../api/endpoints/federation/instances.ts | 12 +-
.../api/endpoints/federation/show-instance.ts | 8 +-
.../federation/update-remote-user.ts | 4 +-
.../server/api/endpoints/federation/users.ts | 14 +-
.../server/api/endpoints/following/create.ts | 10 +-
.../server/api/endpoints/following/delete.ts | 10 +-
.../api/endpoints/following/invalidate.ts | 10 +-
.../endpoints/following/requests/accept.ts | 4 +-
.../endpoints/following/requests/cancel.ts | 10 +-
.../api/endpoints/following/requests/list.ts | 28 +-
.../endpoints/following/requests/reject.ts | 4 +-
.../server/api/endpoints/gallery/featured.ts | 12 +-
.../server/api/endpoints/gallery/popular.ts | 12 +-
.../src/server/api/endpoints/gallery/posts.ts | 10 +-
.../api/endpoints/gallery/posts/create.ts | 8 +-
.../api/endpoints/gallery/posts/delete.ts | 4 +-
.../api/endpoints/gallery/posts/like.ts | 4 +-
.../api/endpoints/gallery/posts/show.ts | 8 +-
.../api/endpoints/gallery/posts/unlike.ts | 4 +-
.../api/endpoints/gallery/posts/update.ts | 8 +-
.../api/endpoints/get-online-users-count.ts | 4 +-
.../src/server/api/endpoints/hashtags/list.ts | 12 +-
.../server/api/endpoints/hashtags/search.ts | 12 +-
.../src/server/api/endpoints/hashtags/show.ts | 8 +-
.../server/api/endpoints/hashtags/trend.ts | 28 +-
.../server/api/endpoints/hashtags/users.ts | 14 +-
.../backend/src/server/api/endpoints/i.ts | 12 +-
.../src/server/api/endpoints/i/2fa/done.ts | 4 +-
.../server/api/endpoints/i/2fa/key-done.ts | 4 +-
.../api/endpoints/i/2fa/password-less.ts | 4 +-
.../api/endpoints/i/2fa/register-key.ts | 4 +-
.../server/api/endpoints/i/2fa/register.ts | 4 +-
.../server/api/endpoints/i/2fa/remove-key.ts | 4 +-
.../server/api/endpoints/i/2fa/unregister.ts | 4 +-
.../src/server/api/endpoints/i/apps.ts | 4 +-
.../server/api/endpoints/i/authorized-apps.ts | 4 +-
.../server/api/endpoints/i/change-password.ts | 4 +-
.../server/api/endpoints/i/delete-account.ts | 4 +-
.../server/api/endpoints/i/export-blocking.ts | 4 +-
.../api/endpoints/i/export-following.ts | 4 +-
.../src/server/api/endpoints/i/export-mute.ts | 4 +-
.../server/api/endpoints/i/export-notes.ts | 4 +-
.../api/endpoints/i/export-user-lists.ts | 4 +-
.../src/server/api/endpoints/i/favorites.ts | 12 +-
.../server/api/endpoints/i/gallery/likes.ts | 16 +-
.../server/api/endpoints/i/gallery/posts.ts | 12 +-
.../endpoints/i/get-word-muted-notes-count.ts | 12 +-
.../server/api/endpoints/i/import-blocking.ts | 4 +-
.../api/endpoints/i/import-following.ts | 4 +-
.../server/api/endpoints/i/import-muting.ts | 4 +-
.../api/endpoints/i/import-user-lists.ts | 4 +-
.../server/api/endpoints/i/notifications.ts | 12 +-
.../src/server/api/endpoints/i/page-likes.ts | 16 +-
.../src/server/api/endpoints/i/pages.ts | 12 +-
.../backend/src/server/api/endpoints/i/pin.ts | 12 +-
.../i/read-all-messaging-messages.ts | 4 +-
.../api/endpoints/i/read-all-unread-notes.ts | 4 +-
.../api/endpoints/i/read-announcement.ts | 4 +-
.../api/endpoints/i/regenerate-token.ts | 4 +-
.../api/endpoints/i/registry/get-all.ts | 4 +-
.../api/endpoints/i/registry/get-detail.ts | 4 +-
.../server/api/endpoints/i/registry/get.ts | 4 +-
.../endpoints/i/registry/keys-with-type.ts | 4 +-
.../server/api/endpoints/i/registry/keys.ts | 4 +-
.../server/api/endpoints/i/registry/remove.ts | 4 +-
.../server/api/endpoints/i/registry/scopes.ts | 4 +-
.../server/api/endpoints/i/registry/set.ts | 4 +-
.../server/api/endpoints/i/revoke-token.ts | 4 +-
.../server/api/endpoints/i/signin-history.ts | 4 +-
.../src/server/api/endpoints/i/unpin.ts | 12 +-
.../server/api/endpoints/i/update-email.ts | 4 +-
.../src/server/api/endpoints/i/update.ts | 12 +-
.../api/endpoints/i/user-group-invites.ts | 20 +-
.../server/api/endpoints/messaging/history.ts | 12 +-
.../api/endpoints/messaging/messages.ts | 12 +-
.../endpoints/messaging/messages/create.ts | 8 +-
.../endpoints/messaging/messages/delete.ts | 4 +-
.../api/endpoints/messaging/messages/read.ts | 4 +-
.../backend/src/server/api/endpoints/meta.ts | 408 +++++++--------
.../server/api/endpoints/miauth/gen-token.ts | 12 +-
.../src/server/api/endpoints/mute/create.ts | 4 +-
.../src/server/api/endpoints/mute/delete.ts | 4 +-
.../src/server/api/endpoints/mute/list.ts | 12 +-
.../src/server/api/endpoints/my/apps.ts | 48 +-
.../backend/src/server/api/endpoints/notes.ts | 10 +-
.../server/api/endpoints/notes/children.ts | 12 +-
.../src/server/api/endpoints/notes/clips.ts | 14 +-
.../api/endpoints/notes/conversation.ts | 12 +-
.../src/server/api/endpoints/notes/create.ts | 12 +-
.../src/server/api/endpoints/notes/delete.ts | 4 +-
.../api/endpoints/notes/favorites/create.ts | 4 +-
.../api/endpoints/notes/favorites/delete.ts | 4 +-
.../server/api/endpoints/notes/featured.ts | 12 +-
.../api/endpoints/notes/global-timeline.ts | 10 +-
.../api/endpoints/notes/hybrid-timeline.ts | 12 +-
.../api/endpoints/notes/local-timeline.ts | 10 +-
.../server/api/endpoints/notes/mentions.ts | 12 +-
.../endpoints/notes/polls/recommendation.ts | 12 +-
.../server/api/endpoints/notes/polls/vote.ts | 4 +-
.../server/api/endpoints/notes/reactions.ts | 12 +-
.../api/endpoints/notes/reactions/create.ts | 4 +-
.../api/endpoints/notes/reactions/delete.ts | 4 +-
.../src/server/api/endpoints/notes/renotes.ts | 12 +-
.../src/server/api/endpoints/notes/replies.ts | 12 +-
.../api/endpoints/notes/search-by-tag.ts | 10 +-
.../src/server/api/endpoints/notes/search.ts | 12 +-
.../src/server/api/endpoints/notes/show.ts | 8 +-
.../src/server/api/endpoints/notes/state.ts | 20 +-
.../endpoints/notes/thread-muting/create.ts | 4 +-
.../endpoints/notes/thread-muting/delete.ts | 4 +-
.../server/api/endpoints/notes/timeline.ts | 12 +-
.../server/api/endpoints/notes/translate.ts | 8 +-
.../server/api/endpoints/notes/unrenote.ts | 4 +-
.../api/endpoints/notes/user-list-timeline.ts | 12 +-
.../api/endpoints/notes/watching/create.ts | 4 +-
.../api/endpoints/notes/watching/delete.ts | 4 +-
.../api/endpoints/notifications/create.ts | 4 +-
.../notifications/mark-all-as-read.ts | 4 +-
.../api/endpoints/notifications/read.ts | 4 +-
.../src/server/api/endpoints/page-push.ts | 4 +-
.../src/server/api/endpoints/pages/create.ts | 8 +-
.../src/server/api/endpoints/pages/delete.ts | 4 +-
.../server/api/endpoints/pages/featured.ts | 12 +-
.../src/server/api/endpoints/pages/like.ts | 4 +-
.../src/server/api/endpoints/pages/show.ts | 8 +-
.../src/server/api/endpoints/pages/unlike.ts | 4 +-
.../src/server/api/endpoints/pages/update.ts | 4 +-
.../backend/src/server/api/endpoints/ping.ts | 12 +-
.../src/server/api/endpoints/pinned-users.ts | 14 +-
.../src/server/api/endpoints/promo/read.ts | 4 +-
.../api/endpoints/request-reset-password.ts | 4 +-
.../src/server/api/endpoints/reset-db.ts | 4 +-
.../server/api/endpoints/reset-password.ts | 4 +-
.../src/server/api/endpoints/server-info.ts | 4 +-
.../backend/src/server/api/endpoints/stats.ts | 36 +-
.../src/server/api/endpoints/sw/register.ts | 16 +-
.../src/server/api/endpoints/sw/unregister.ts | 4 +-
.../api/endpoints/username/available.ts | 12 +-
.../backend/src/server/api/endpoints/users.ts | 14 +-
.../src/server/api/endpoints/users/clips.ts | 2 +-
.../server/api/endpoints/users/followers.ts | 12 +-
.../server/api/endpoints/users/following.ts | 12 +-
.../api/endpoints/users/gallery/posts.ts | 2 +-
.../users/get-frequently-replied-users.ts | 24 +-
.../api/endpoints/users/groups/create.ts | 8 +-
.../api/endpoints/users/groups/delete.ts | 4 +-
.../users/groups/invitations/accept.ts | 4 +-
.../users/groups/invitations/reject.ts | 4 +-
.../api/endpoints/users/groups/invite.ts | 4 +-
.../api/endpoints/users/groups/joined.ts | 12 +-
.../api/endpoints/users/groups/leave.ts | 4 +-
.../api/endpoints/users/groups/owned.ts | 12 +-
.../server/api/endpoints/users/groups/pull.ts | 4 +-
.../server/api/endpoints/users/groups/show.ts | 8 +-
.../api/endpoints/users/groups/transfer.ts | 8 +-
.../api/endpoints/users/groups/update.ts | 8 +-
.../api/endpoints/users/lists/create.ts | 8 +-
.../api/endpoints/users/lists/delete.ts | 4 +-
.../server/api/endpoints/users/lists/list.ts | 12 +-
.../server/api/endpoints/users/lists/pull.ts | 4 +-
.../server/api/endpoints/users/lists/push.ts | 4 +-
.../server/api/endpoints/users/lists/show.ts | 8 +-
.../api/endpoints/users/lists/update.ts | 8 +-
.../src/server/api/endpoints/users/notes.ts | 10 +-
.../src/server/api/endpoints/users/pages.ts | 2 +-
.../server/api/endpoints/users/reactions.ts | 12 +-
.../api/endpoints/users/recommendation.ts | 14 +-
.../server/api/endpoints/users/relation.ts | 79 ++-
.../api/endpoints/users/report-abuse.ts | 4 +-
.../users/search-by-username-and-host.ts | 14 +-
.../src/server/api/endpoints/users/search.ts | 12 +-
.../src/server/api/endpoints/users/show.ts | 23 +-
.../src/server/api/endpoints/users/stats.ts | 4 +-
.../backend/src/server/api/openapi/schemas.ts | 8 +-
.../backend/src/server/api/stream/types.ts | 4 +-
packages/backend/src/services/chart/core.ts | 14 +-
.../backend/src/services/following/create.ts | 5 +-
358 files changed, 3622 insertions(+), 3416 deletions(-)
delete mode 100644 packages/backend/src/misc/simple-schema.ts
delete mode 100644 packages/backend/src/models/repositories/queue.ts
create mode 100644 packages/backend/src/models/schema/antenna.ts
create mode 100644 packages/backend/src/models/schema/app.ts
create mode 100644 packages/backend/src/models/schema/blocking.ts
create mode 100644 packages/backend/src/models/schema/channel.ts
create mode 100644 packages/backend/src/models/schema/clip.ts
create mode 100644 packages/backend/src/models/schema/drive-file.ts
create mode 100644 packages/backend/src/models/schema/drive-folder.ts
create mode 100644 packages/backend/src/models/schema/emoji.ts
create mode 100644 packages/backend/src/models/schema/federation-instance.ts
create mode 100644 packages/backend/src/models/schema/following.ts
create mode 100644 packages/backend/src/models/schema/gallery-post.ts
create mode 100644 packages/backend/src/models/schema/hashtag.ts
create mode 100644 packages/backend/src/models/schema/messaging-message.ts
create mode 100644 packages/backend/src/models/schema/muting.ts
create mode 100644 packages/backend/src/models/schema/note-favorite.ts
create mode 100644 packages/backend/src/models/schema/note-reaction.ts
create mode 100644 packages/backend/src/models/schema/note.ts
create mode 100644 packages/backend/src/models/schema/notification.ts
create mode 100644 packages/backend/src/models/schema/page.ts
create mode 100644 packages/backend/src/models/schema/queue.ts
create mode 100644 packages/backend/src/models/schema/user-group.ts
create mode 100644 packages/backend/src/models/schema/user-list.ts
create mode 100644 packages/backend/src/models/schema/user.ts
delete mode 100644 packages/backend/src/server/api/endpoints/admin/delete-logs.ts
diff --git a/packages/backend/src/misc/schema.ts b/packages/backend/src/misc/schema.ts
index ae6f1bac86..2dae954af9 100644
--- a/packages/backend/src/misc/schema.ts
+++ b/packages/backend/src/misc/schema.ts
@@ -1,30 +1,44 @@
-import { SimpleObj, SimpleSchema } from './simple-schema';
-import { packedUserSchema } from '@/models/repositories/user';
-import { packedNoteSchema } from '@/models/repositories/note';
-import { packedUserListSchema } from '@/models/repositories/user-list';
-import { packedAppSchema } from '@/models/repositories/app';
-import { packedMessagingMessageSchema } from '@/models/repositories/messaging-message';
-import { packedNotificationSchema } from '@/models/repositories/notification';
-import { packedDriveFileSchema } from '@/models/repositories/drive-file';
-import { packedDriveFolderSchema } from '@/models/repositories/drive-folder';
-import { packedFollowingSchema } from '@/models/repositories/following';
-import { packedMutingSchema } from '@/models/repositories/muting';
-import { packedBlockingSchema } from '@/models/repositories/blocking';
-import { packedNoteReactionSchema } from '@/models/repositories/note-reaction';
-import { packedHashtagSchema } from '@/models/repositories/hashtag';
-import { packedPageSchema } from '@/models/repositories/page';
-import { packedUserGroupSchema } from '@/models/repositories/user-group';
-import { packedNoteFavoriteSchema } from '@/models/repositories/note-favorite';
-import { packedChannelSchema } from '@/models/repositories/channel';
-import { packedAntennaSchema } from '@/models/repositories/antenna';
-import { packedClipSchema } from '@/models/repositories/clip';
-import { packedFederationInstanceSchema } from '@/models/repositories/federation-instance';
-import { packedQueueCountSchema } from '@/models/repositories/queue';
-import { packedGalleryPostSchema } from '@/models/repositories/gallery-post';
-import { packedEmojiSchema } from '@/models/repositories/emoji';
+import {
+ packedUserLiteSchema,
+ packedUserDetailedNotMeOnlySchema,
+ packedMeDetailedOnlySchema,
+ packedUserDetailedNotMeSchema,
+ packedMeDetailedSchema,
+ packedUserDetailedSchema,
+ packedUserSchema,
+} from '@/models/schema/user';
+import { packedNoteSchema } from '@/models/schema/note';
+import { packedUserListSchema } from '@/models/schema/user-list';
+import { packedAppSchema } from '@/models/schema/app';
+import { packedMessagingMessageSchema } from '@/models/schema/messaging-message';
+import { packedNotificationSchema } from '@/models/schema/notification';
+import { packedDriveFileSchema } from '@/models/schema/drive-file';
+import { packedDriveFolderSchema } from '@/models/schema/drive-folder';
+import { packedFollowingSchema } from '@/models/schema/following';
+import { packedMutingSchema } from '@/models/schema/muting';
+import { packedBlockingSchema } from '@/models/schema/blocking';
+import { packedNoteReactionSchema } from '@/models/schema/note-reaction';
+import { packedHashtagSchema } from '@/models/schema/hashtag';
+import { packedPageSchema } from '@/models/schema/page';
+import { packedUserGroupSchema } from '@/models/schema/user-group';
+import { packedNoteFavoriteSchema } from '@/models/schema/note-favorite';
+import { packedChannelSchema } from '@/models/schema/channel';
+import { packedAntennaSchema } from '@/models/schema/antenna';
+import { packedClipSchema } from '@/models/schema/clip';
+import { packedFederationInstanceSchema } from '@/models/schema/federation-instance';
+import { packedQueueCountSchema } from '@/models/schema/queue';
+import { packedGalleryPostSchema } from '@/models/schema/gallery-post';
+import { packedEmojiSchema } from '@/models/schema/emoji';
export const refs = {
+ UserLite: packedUserLiteSchema,
+ UserDetailedNotMeOnly: packedUserDetailedNotMeOnlySchema,
+ MeDetailedOnly: packedMeDetailedOnlySchema,
+ UserDetailedNotMe: packedUserDetailedNotMeSchema,
+ MeDetailed: packedMeDetailedSchema,
+ UserDetailed: packedUserDetailedSchema,
User: packedUserSchema,
+
UserList: packedUserListSchema,
UserGroup: packedUserGroupSchema,
App: packedAppSchema,
@@ -49,12 +63,50 @@ export const refs = {
Emoji: packedEmojiSchema,
};
-export type Packed<x extends keyof typeof refs> = ObjType<(typeof refs[x])['properties']>;
+// Packed = SchemaTypeDef<typeof refs[x]>; ã¨ã™ã‚‹ã¨å±•é–‹ã•ã‚Œã¦ãƒžã‚¦ã‚¹ãƒ›ãƒãƒ¼æ™‚ã«åž‹è¡¨ç¤ºãŒä½¿ã„物ã«ãªã‚‰ãªããªã‚‹
+// ObjType<r['properties']>を指定ã™ã‚‹ã¨ï¼ˆãªãœã‹ï¼‰å±•é–‹ã•ã‚Œãšã«Packed<'Hoge'>ã¨è¡¨ç¤ºã•ã‚Œã‚‹
+type PackedDef<r extends { properties?: Obj; oneOf?: ReadonlyArray<MinimumSchema>; allOf?: ReadonlyArray<MinimumSchema> }> =
+ r['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<r['allOf']>> :
+ r['oneOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<r['oneOf']> :
+ r['properties'] extends Obj ? ObjType<r['properties']> :
+ never;
+export type Packed<x extends keyof typeof refs> = PackedDef<typeof refs[x]>;
+
+type TypeStringef = 'boolean' | 'number' | 'string' | 'array' | 'object' | 'any';
+type StringDefToType<T extends TypeStringef> =
+ T extends 'boolean' ? boolean :
+ T extends 'number' ? number :
+ T extends 'string' ? string | Date :
+ T extends 'array' ? ReadonlyArray<any> :
+ T extends 'object' ? Record<string, any> :
+ any;
+
+// https://swagger.io/specification/?sbsearch=optional#schema-object
+type OfSchema = {
+ readonly anyOf?: ReadonlyArray<MinimumSchema>;
+ readonly oneOf?: ReadonlyArray<MinimumSchema>;
+ readonly allOf?: ReadonlyArray<MinimumSchema>;
+}
+
+export interface MinimumSchema extends OfSchema {
+ readonly type?: TypeStringef;
+ readonly nullable?: boolean;
+ readonly optional?: boolean;
+ readonly items?: MinimumSchema;
+ readonly properties?: Obj;
+ readonly description?: string;
+ readonly example?: any;
+ readonly format?: string;
+ readonly ref?: keyof typeof refs;
+ readonly enum?: ReadonlyArray<string>;
+ readonly default?: (this['type'] extends TypeStringef ? StringDefToType<this['type']> : any) | null;
+ readonly maxLength?: number;
+ readonly minLength?: number;
+}
-export interface Schema extends SimpleSchema {
- items?: Schema;
- properties?: Obj;
- ref?: keyof typeof refs;
+export interface Schema extends MinimumSchema {
+ readonly nullable: boolean;
+ readonly optional: boolean;
}
type NonUndefinedPropertyNames<T extends Obj> = {
@@ -65,22 +117,13 @@ type UndefinedPropertyNames<T extends Obj> = {
[K in keyof T]: T[K]['optional'] extends true ? K : never
}[keyof T];
-type OnlyRequired<T extends Obj> = Pick<T, NonUndefinedPropertyNames<T>>;
-type OnlyOptional<T extends Obj> = Pick<T, UndefinedPropertyNames<T>>;
-
-export interface Obj extends SimpleObj { [key: string]: Schema; }
+export interface Obj { [key: string]: Schema; }
export type ObjType<s extends Obj> =
- { [P in keyof OnlyOptional<s>]?: SchemaType<s[P]> } &
- { [P in keyof OnlyRequired<s>]: SchemaType<s[P]> };
-
-// https://qiita.com/hrsh7th@github/items/84e8968c3601009cdcf2
-type MyType<T extends Schema> = {
- 0: any;
- 1: SchemaType<T>;
-}[T extends Schema ? 1 : 0];
+ { -readonly [P in UndefinedPropertyNames<s>]?: SchemaType<s[P]> } &
+ { -readonly [P in NonUndefinedPropertyNames<s>]: SchemaType<s[P]> };
-type NullOrUndefined<p extends Schema, T> =
+type NullOrUndefined<p extends MinimumSchema, T> =
p['nullable'] extends true
? p['optional'] extends true
? (T | null | undefined)
@@ -89,15 +132,41 @@ type NullOrUndefined<p extends Schema, T> =
? (T | undefined)
: T;
-export type SchemaType<p extends Schema> =
- p['type'] extends 'number' ? NullOrUndefined<p, number> :
- p['type'] extends 'string' ? NullOrUndefined<p, string> :
- p['type'] extends 'boolean' ? NullOrUndefined<p, boolean> :
- p['type'] extends 'array' ? NullOrUndefined<p, MyType<NonNullable<p['items']>>[]> :
+// 共用体型を交差型ã«ã™ã‚‹åž‹ https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+
+// https://github.com/misskey-dev/misskey/pull/8144#discussion_r785287552
+// å˜ç´”ã«SchemaTypeDef<X>ã§åˆ¤å®šã™ã‚‹ã ã‘ã§ã¯ãƒ€ãƒ¡
+type UnionSchemaType<a extends readonly any[], X extends MinimumSchema = a[number]> = X extends any ? SchemaType<X> : never;
+type ArrayUnion<T> = T extends any ? Array<T> : never;
+
+export type SchemaTypeDef<p extends MinimumSchema> =
+ p['type'] extends 'number' ? number :
+ p['type'] extends 'string' ? (
+ p['enum'] extends readonly string[] ?
+ p['enum'][number] :
+ p['format'] extends 'date-time' ? string : // Dateã«ã™ã‚‹ï¼Ÿï¼Ÿ
+ string
+ ) :
+ p['type'] extends 'boolean' ? boolean :
p['type'] extends 'object' ? (
- p['ref'] extends keyof typeof refs
- ? NullOrUndefined<p, Packed<p['ref']>>
- : NullOrUndefined<p, ObjType<NonNullable<p['properties']>>>
+ p['ref'] extends keyof typeof refs ? Packed<p['ref']> :
+ p['properties'] extends NonNullable<Obj> ? ObjType<p['properties']> :
+ p['anyOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<p['anyOf']> & Partial<UnionToIntersection<UnionSchemaType<p['anyOf']>>> :
+ p['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<p['allOf']>> :
+ any
+ ) :
+ p['type'] extends 'array' ? (
+ p['items'] extends OfSchema ? (
+ p['items']['anyOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<NonNullable<p['items']['anyOf']>>[] :
+ p['items']['oneOf'] extends ReadonlyArray<MinimumSchema> ? ArrayUnion<UnionSchemaType<NonNullable<p['items']['oneOf']>>> :
+ p['items']['allOf'] extends ReadonlyArray<MinimumSchema> ? UnionToIntersection<UnionSchemaType<NonNullable<p['items']['allOf']>>>[] :
+ never
+ ) :
+ p['items'] extends NonNullable<MinimumSchema> ? SchemaTypeDef<p['items']>[] :
+ any[]
) :
- p['type'] extends 'any' ? NullOrUndefined<p, any> :
+ p['oneOf'] extends ReadonlyArray<MinimumSchema> ? UnionSchemaType<p['oneOf']> :
any;
+
+export type SchemaType<p extends MinimumSchema> = NullOrUndefined<p, SchemaTypeDef<p>>;
diff --git a/packages/backend/src/misc/simple-schema.ts b/packages/backend/src/misc/simple-schema.ts
deleted file mode 100644
index abbb348e24..0000000000
--- a/packages/backend/src/misc/simple-schema.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export interface SimpleSchema {
- type: 'boolean' | 'number' | 'string' | 'array' | 'object' | 'any';
- nullable: boolean;
- optional: boolean;
- items?: SimpleSchema;
- properties?: SimpleObj;
- description?: string;
- example?: any;
- format?: string;
- ref?: string;
- enum?: string[];
- default?: boolean | null;
-}
-
-export interface SimpleObj { [key: string]: SimpleSchema; }
diff --git a/packages/backend/src/models/repositories/antenna.ts b/packages/backend/src/models/repositories/antenna.ts
index 548f44f1b7..3bf0645a7f 100644
--- a/packages/backend/src/models/repositories/antenna.ts
+++ b/packages/backend/src/models/repositories/antenna.ts
@@ -31,94 +31,3 @@ export class AntennaRepository extends Repository<Antenna> {
};
}
}
-
-export const packedAntennaSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- keywords: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
- },
- excludeKeywords: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
- },
- src: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- enum: ['home', 'all', 'users', 'list', 'group'],
- },
- userListId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'id',
- },
- userGroupId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'id',
- },
- users: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
- caseSensitive: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- default: false,
- },
- notify: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- withReplies: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- default: false,
- },
- withFile: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- hasUnreadNote: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- default: false,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/app.ts b/packages/backend/src/models/repositories/app.ts
index bec0765ac2..6bac4d9598 100644
--- a/packages/backend/src/models/repositories/app.ts
+++ b/packages/backend/src/models/repositories/app.ts
@@ -38,38 +38,3 @@ export class AppRepository extends Repository<App> {
};
}
}
-
-export const packedAppSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- callbackUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- permission: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
- secret: {
- type: 'string' as const,
- optional: true as const, nullable: false as const,
- },
- isAuthorized: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/blocking.ts b/packages/backend/src/models/repositories/blocking.ts
index a6895eabf4..c20b02f501 100644
--- a/packages/backend/src/models/repositories/blocking.ts
+++ b/packages/backend/src/models/repositories/blocking.ts
@@ -30,31 +30,3 @@ export class BlockingRepository extends Repository<Blocking> {
return Promise.all(blockings.map(x => this.pack(x, me)));
}
}
-
-export const packedBlockingSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- blockeeId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- blockee: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User' as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/channel.ts b/packages/backend/src/models/repositories/channel.ts
index 0a6b02f495..b3afb823ab 100644
--- a/packages/backend/src/models/repositories/channel.ts
+++ b/packages/backend/src/models/repositories/channel.ts
@@ -40,56 +40,3 @@ export class ChannelRepository extends Repository<Channel> {
};
}
}
-
-export const packedChannelSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- lastNotedAt: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'date-time',
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- description: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
- },
- bannerUrl: {
- type: 'string' as const,
- format: 'url',
- nullable: true as const, optional: false as const,
- },
- notesCount: {
- type: 'number' as const,
- nullable: false as const, optional: false as const,
- },
- usersCount: {
- type: 'number' as const,
- nullable: false as const, optional: false as const,
- },
- isFollowing: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- userId: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
- format: 'id',
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/clip.ts b/packages/backend/src/models/repositories/clip.ts
index 7892811d48..6f9ceeb50a 100644
--- a/packages/backend/src/models/repositories/clip.ts
+++ b/packages/backend/src/models/repositories/clip.ts
@@ -29,42 +29,3 @@ export class ClipRepository extends Repository<Clip> {
}
}
-export const packedClipSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- userId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- user: {
- type: 'object' as const,
- ref: 'User' as const,
- optional: false as const, nullable: false as const,
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- description: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- isPublic: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/drive-file.ts b/packages/backend/src/models/repositories/drive-file.ts
index 79b890aa6e..44db9a0a58 100644
--- a/packages/backend/src/models/repositories/drive-file.ts
+++ b/packages/backend/src/models/repositories/drive-file.ts
@@ -3,7 +3,7 @@ import { DriveFile } from '@/models/entities/drive-file';
import { Users, DriveFolders } from '../index';
import { User } from '@/models/entities/user';
import { toPuny } from '@/misc/convert-host';
-import { awaitAll } from '@/prelude/await-all';
+import { awaitAll, Promiseable } from '@/prelude/await-all';
import { Packed } from '@/misc/schema';
import config from '@/config/index';
import { query, appendQuery } from '@/prelude/url';
@@ -126,7 +126,7 @@ export class DriveFileRepository extends Repository<DriveFile> {
const meta = await fetchMeta();
- return await awaitAll({
+ return await awaitAll<Packed<'DriveFile'>>({
id: file.id,
createdAt: file.createdAt.toISOString(),
name: file.name,
@@ -156,112 +156,3 @@ export class DriveFileRepository extends Repository<DriveFile> {
return items.filter(x => x != null);
}
}
-
-export const packedDriveFileSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- example: 'lenna.jpg',
- },
- type: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- example: 'image/jpeg',
- },
- md5: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'md5',
- example: '15eca7fba0480996e2245f5185bf39f2',
- },
- size: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- example: 51469,
- },
- isSensitive: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- blurhash: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- properties: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- width: {
- type: 'number' as const,
- optional: true as const, nullable: false as const,
- example: 1280,
- },
- height: {
- type: 'number' as const,
- optional: true as const, nullable: false as const,
- example: 720,
- },
- orientation: {
- type: 'number' as const,
- optional: true as const, nullable: false as const,
- example: 8,
- },
- avgColor: {
- type: 'string' as const,
- optional: true as const, nullable: false as const,
- example: 'rgb(40,65,87)',
- },
- },
- },
- url: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'url',
- },
- thumbnailUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'url',
- },
- comment: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- folderId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- folder: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'DriveFolder' as const,
- },
- userId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- user: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'User' as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/drive-folder.ts b/packages/backend/src/models/repositories/drive-folder.ts
index 4ee4a68e08..b2e6cee9b8 100644
--- a/packages/backend/src/models/repositories/drive-folder.ts
+++ b/packages/backend/src/models/repositories/drive-folder.ts
@@ -48,44 +48,3 @@ export class DriveFolderRepository extends Repository<DriveFolder> {
});
}
}
-
-export const packedDriveFolderSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- foldersCount: {
- type: 'number' as const,
- optional: true as const, nullable: false as const,
- },
- filesCount: {
- type: 'number' as const,
- optional: true as const, nullable: false as const,
- },
- parentId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- parent: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'DriveFolder' as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/emoji.ts b/packages/backend/src/models/repositories/emoji.ts
index b7529595a9..9d63ced811 100644
--- a/packages/backend/src/models/repositories/emoji.ts
+++ b/packages/backend/src/models/repositories/emoji.ts
@@ -25,41 +25,3 @@ export class EmojiRepository extends Repository<Emoji> {
return Promise.all(emojis.map(x => this.pack(x)));
}
}
-
-export const packedEmojiSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- aliases: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- category: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- host: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- url: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/federation-instance.ts b/packages/backend/src/models/repositories/federation-instance.ts
index 90dbbaab1c..426fd5bfc3 100644
--- a/packages/backend/src/models/repositories/federation-instance.ts
+++ b/packages/backend/src/models/repositories/federation-instance.ts
@@ -1,106 +1,2 @@
import config from '@/config/index';
-export const packedFederationInstanceSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- caughtAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- host: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- example: 'misskey.example.com',
- },
- usersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- notesCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- followingCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- followersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- driveUsage: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- driveFiles: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- latestRequestSentAt: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'date-time',
- },
- lastCommunicatedAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- isNotResponding: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- isSuspended: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- softwareName: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- example: 'misskey',
- },
- softwareVersion: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- example: config.version,
- },
- openRegistrations: {
- type: 'boolean' as const,
- optional: false as const, nullable: true as const,
- example: true,
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- description: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- maintainerName: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- maintainerEmail: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- iconUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'url',
- },
- infoUpdatedAt: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'date-time',
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/following.ts b/packages/backend/src/models/repositories/following.ts
index 1dfaaf908a..9d20f442df 100644
--- a/packages/backend/src/models/repositories/following.ts
+++ b/packages/backend/src/models/repositories/following.ts
@@ -84,41 +84,3 @@ export class FollowingRepository extends Repository<Following> {
return Promise.all(followings.map(x => this.pack(x, me, opts)));
}
}
-
-export const packedFollowingSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- followeeId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- followee: {
- type: 'object' as const,
- optional: true as const, nullable: false as const,
- ref: 'User' as const,
- },
- followerId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- follower: {
- type: 'object' as const,
- optional: true as const, nullable: false as const,
- ref: 'User' as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/gallery-post.ts b/packages/backend/src/models/repositories/gallery-post.ts
index 6d37e3120e..e9233bb91e 100644
--- a/packages/backend/src/models/repositories/gallery-post.ts
+++ b/packages/backend/src/models/repositories/gallery-post.ts
@@ -38,74 +38,3 @@ export class GalleryPostRepository extends Repository<GalleryPost> {
return Promise.all(posts.map(x => this.pack(x, me)));
}
}
-
-export const packedGalleryPostSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- updatedAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- title: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- description: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- userId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- user: {
- type: 'object' as const,
- ref: 'User' as const,
- optional: false as const, nullable: false as const,
- },
- fileIds: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- },
- files: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'DriveFile' as const,
- },
- },
- tags: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
- isSensitive: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/hashtag.ts b/packages/backend/src/models/repositories/hashtag.ts
index 6e513c7ebb..c4b8d50c4e 100644
--- a/packages/backend/src/models/repositories/hashtag.ts
+++ b/packages/backend/src/models/repositories/hashtag.ts
@@ -24,39 +24,3 @@ export class HashtagRepository extends Repository<Hashtag> {
return Promise.all(hashtags.map(x => this.pack(x)));
}
}
-
-export const packedHashtagSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- tag: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- example: 'misskey',
- },
- mentionedUsersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- mentionedLocalUsersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- mentionedRemoteUsersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- attachedUsersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- attachedLocalUsersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- attachedRemoteUsersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/messaging-message.ts b/packages/backend/src/models/repositories/messaging-message.ts
index 1b2dd3a246..0a342430b9 100644
--- a/packages/backend/src/models/repositories/messaging-message.ts
+++ b/packages/backend/src/models/repositories/messaging-message.ts
@@ -42,78 +42,3 @@ export class MessagingMessageRepository extends Repository<MessagingMessage> {
};
}
}
-
-export const packedMessagingMessageSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- userId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- user: {
- type: 'object' as const,
- ref: 'User' as const,
- optional: true as const, nullable: false as const,
- },
- text: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- fileId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- format: 'id',
- },
- file: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'DriveFile' as const,
- },
- recipientId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'id',
- },
- recipient: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'User' as const,
- },
- groupId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- format: 'id',
- },
- group: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'UserGroup' as const,
- },
- isRead: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- reads: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/muting.ts b/packages/backend/src/models/repositories/muting.ts
index b82d1f0daa..bdbe9b47da 100644
--- a/packages/backend/src/models/repositories/muting.ts
+++ b/packages/backend/src/models/repositories/muting.ts
@@ -30,31 +30,3 @@ export class MutingRepository extends Repository<Muting> {
return Promise.all(mutings.map(x => this.pack(x, me)));
}
}
-
-export const packedMutingSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- muteeId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- mutee: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User' as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/note-favorite.ts b/packages/backend/src/models/repositories/note-favorite.ts
index 47586a9116..c5de55c0c0 100644
--- a/packages/backend/src/models/repositories/note-favorite.ts
+++ b/packages/backend/src/models/repositories/note-favorite.ts
@@ -26,31 +26,3 @@ export class NoteFavoriteRepository extends Repository<NoteFavorite> {
return Promise.all(favorites.map(x => this.pack(x, me)));
}
}
-
-export const packedNoteFavoriteSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- note: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'Note' as const,
- },
- noteId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/note-reaction.ts b/packages/backend/src/models/repositories/note-reaction.ts
index dfb25cbea1..097574effa 100644
--- a/packages/backend/src/models/repositories/note-reaction.ts
+++ b/packages/backend/src/models/repositories/note-reaction.ts
@@ -31,30 +31,3 @@ export class NoteReactionRepository extends Repository<NoteReaction> {
};
}
}
-
-export const packedNoteReactionSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- user: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User' as const,
- },
- type: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index 96dfad70e9..9a7fef4977 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -218,7 +218,7 @@ export class NoteRepository extends Repository<Note> {
const reactionEmojiNames = Object.keys(note.reactions).filter(x => x?.startsWith(':')).map(x => decodeReaction(x).reaction).map(x => x.replace(/:/g, ''));
- const packed = await awaitAll({
+ const packed: Packed<'Note'> = await awaitAll({
id: note.id,
createdAt: note.createdAt.toISOString(),
userId: note.userId,
@@ -320,188 +320,3 @@ export class NoteRepository extends Repository<Note> {
})));
}
}
-
-export const packedNoteSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- text: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- cw: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- },
- userId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- user: {
- type: 'object' as const,
- ref: 'User' as const,
- optional: false as const, nullable: false as const,
- },
- replyId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- renoteId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- reply: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'Note' as const,
- },
- renote: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- ref: 'Note' as const,
- },
- isHidden: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- visibility: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- mentions: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- },
- visibleUserIds: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- },
- fileIds: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- },
- files: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'DriveFile' as const,
- },
- },
- tags: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
- items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- },
- poll: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- },
- channelId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- channel: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- },
- },
- },
- localOnly: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- emojis: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- url: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- },
- },
- },
- reactions: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- },
- renoteCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- repliesCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- uri: {
- type: 'string' as const,
- optional: true as const, nullable: false as const,
- },
- url: {
- type: 'string' as const,
- optional: true as const, nullable: false as const,
- },
-
- myReaction: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/notification.ts b/packages/backend/src/models/repositories/notification.ts
index 47d569ed21..5e42798898 100644
--- a/packages/backend/src/models/repositories/notification.ts
+++ b/packages/backend/src/models/repositories/notification.ts
@@ -107,69 +107,3 @@ export class NotificationRepository extends Repository<Notification> {
})));
}
}
-
-export const packedNotificationSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- isRead: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
- },
- type: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- enum: [...notificationTypes],
- },
- user: {
- type: 'object' as const,
- ref: 'User' as const,
- optional: true as const, nullable: true as const,
- },
- userId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- format: 'id',
- },
- note: {
- type: 'object' as const,
- ref: 'Note' as const,
- optional: true as const, nullable: true as const,
- },
- reaction: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- },
- choice: {
- type: 'number' as const,
- optional: true as const, nullable: true as const,
- },
- invitation: {
- type: 'object' as const,
- optional: true as const, nullable: true as const,
- },
- body: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- },
- header: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- },
- icon: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/page.ts b/packages/backend/src/models/repositories/page.ts
index 46b453cad9..ec76c2e418 100644
--- a/packages/backend/src/models/repositories/page.ts
+++ b/packages/backend/src/models/repositories/page.ts
@@ -87,56 +87,3 @@ export class PageRepository extends Repository<Page> {
return Promise.all(pages.map(x => this.pack(x, me)));
}
}
-
-export const packedPageSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- updatedAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- title: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- summary: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
- },
- content: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- },
- variables: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
- },
- userId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- },
- user: {
- type: 'object' as const,
- ref: 'User' as const,
- optional: false as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/queue.ts b/packages/backend/src/models/repositories/queue.ts
deleted file mode 100644
index 521c634390..0000000000
--- a/packages/backend/src/models/repositories/queue.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export const packedQueueCountSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- waiting: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- active: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- completed: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- failed: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- delayed: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- paused: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/user-group.ts b/packages/backend/src/models/repositories/user-group.ts
index 02a0348885..3ed37ca0ed 100644
--- a/packages/backend/src/models/repositories/user-group.ts
+++ b/packages/backend/src/models/repositories/user-group.ts
@@ -23,39 +23,3 @@ export class UserGroupRepository extends Repository<UserGroup> {
};
}
}
-
-export const packedUserGroupSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- ownerId: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- format: 'id',
- },
- userIds: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- items: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- format: 'id',
- },
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/user-list.ts b/packages/backend/src/models/repositories/user-list.ts
index 792a17cb49..a2bffe8357 100644
--- a/packages/backend/src/models/repositories/user-list.ts
+++ b/packages/backend/src/models/repositories/user-list.ts
@@ -22,34 +22,3 @@ export class UserListRepository extends Repository<UserList> {
};
}
}
-
-export const packedUserListSchema = {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- format: 'date-time',
- },
- name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- },
- userIds: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- items: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- format: 'id',
- },
- },
- },
-};
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 85141cdc41..2b8398832d 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -4,11 +4,19 @@ import { User, ILocalUser, IRemoteUser } from '@/models/entities/user';
import { Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages, Announcements, AnnouncementReads, Antennas, AntennaNotes, ChannelFollowings, Instances } from '../index';
import config from '@/config/index';
import { Packed } from '@/misc/schema';
-import { awaitAll } from '@/prelude/await-all';
+import { awaitAll, Promiseable } from '@/prelude/await-all';
import { populateEmojis } from '@/misc/populate-emojis';
import { getAntennas } from '@/misc/antenna-cache';
import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const';
+type IsUserDetailed<Detailed extends boolean> = Detailed extends true ? Packed<'UserDetailed'> : Packed<'UserLite'>;
+type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends boolean> =
+ Detailed extends true ?
+ ExpectsMe extends true ? Packed<'MeDetailed'> :
+ ExpectsMe extends false ? Packed<'UserDetailedNotMe'> :
+ Packed<'UserDetailed'> :
+ Packed<'UserLite'>;
+
@EntityRepository(User)
export class UserRepository extends Repository<User> {
public async getRelation(me: User['id'], target: User['id']) {
@@ -144,7 +152,7 @@ export class UserRepository extends Repository<User> {
return count > 0;
}
- public getOnlineStatus(user: User): string {
+ public getOnlineStatus(user: User): 'unknown' | 'online' | 'active' | 'offline' {
if (user.hideOnlineStatus) return 'unknown';
if (user.lastActiveDate == null) return 'unknown';
const elapsed = Date.now() - user.lastActiveDate.getTime();
@@ -163,14 +171,14 @@ export class UserRepository extends Repository<User> {
}
}
- public async pack(
+ public async pack<ExpectsMe extends boolean | null = null, D extends boolean = false>(
src: User['id'] | User,
me?: { id: User['id'] } | null | undefined,
options?: {
- detail?: boolean,
+ detail?: D,
includeSecrets?: boolean,
}
- ): Promise<Packed<'User'>> {
+ ): Promise<IsMeAndIsUserDetailed<ExpectsMe, D>> {
const opts = Object.assign({
detail: false,
includeSecrets: false,
@@ -178,8 +186,9 @@ export class UserRepository extends Repository<User> {
const user = typeof src === 'object' ? src : await this.findOneOrFail(src);
const meId = me ? me.id : null;
+ const isMe = meId === user.id;
- const relation = meId && (meId !== user.id) && opts.detail ? await this.getRelation(meId, user.id) : null;
+ const relation = meId && !isMe && opts.detail ? await this.getRelation(meId, user.id) : null;
const pins = opts.detail ? await UserNotePinings.createQueryBuilder('pin')
.where('pin.userId = :userId', { userId: user.id })
.innerJoinAndSelect('pin.note', 'note')
@@ -188,12 +197,12 @@ export class UserRepository extends Repository<User> {
const profile = opts.detail ? await UserProfiles.findOneOrFail(user.id) : null;
const followingCount = profile == null ? null :
- (profile.ffVisibility === 'public') || (meId === user.id) ? user.followingCount :
+ (profile.ffVisibility === 'public') || isMe ? user.followingCount :
(profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followingCount :
null;
const followersCount = profile == null ? null :
- (profile.ffVisibility === 'public') || (meId === user.id) ? user.followersCount :
+ (profile.ffVisibility === 'public') || isMe ? user.followersCount :
(profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
null;
@@ -227,12 +236,11 @@ export class UserRepository extends Repository<User> {
uri: user.uri,
createdAt: user.createdAt.toISOString(),
updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,
- lastFetchedAt: user.lastFetchedAt?.toISOString(),
+ lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null,
bannerUrl: user.bannerUrl,
bannerBlurhash: user.bannerBlurhash,
bannerColor: null, // 後方互æ›æ€§ã®ãŸã‚
isLocked: user.isLocked,
- isModerator: user.isModerator || falsy,
isSilenced: user.isSilenced || falsy,
isSuspended: user.isSuspended || falsy,
description: profile!.description,
@@ -260,7 +268,7 @@ export class UserRepository extends Repository<User> {
: false,
} : {}),
- ...(opts.detail && meId === user.id ? {
+ ...(opts.detail && isMe ? {
avatarId: user.avatarId,
bannerId: user.bannerId,
injectFeaturedNote: profile!.injectFeaturedNote,
@@ -315,19 +323,19 @@ export class UserRepository extends Repository<User> {
isBlocked: relation.isBlocked,
isMuted: relation.isMuted,
} : {}),
- };
+ } as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;
return await awaitAll(packed);
}
- public packMany(
+ public packMany<D extends boolean = false>(
users: (User['id'] | User)[],
me?: { id: User['id'] } | null | undefined,
options?: {
- detail?: boolean,
+ detail?: D,
includeSecrets?: boolean,
}
- ) {
+ ): Promise<IsUserDetailed<D>[]> {
return Promise.all(users.map(u => this.pack(u, me, options)));
}
@@ -352,313 +360,3 @@ export class UserRepository extends Repository<User> {
public validateBirthday = $.str.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})$/);
//#endregion
}
-
-export const packedUserSchema = {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
- properties: {
- id: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- name: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
- example: 'è—',
- },
- username: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- example: 'ai',
- },
- host: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
- example: 'misskey.example.com',
- },
- avatarUrl: {
- type: 'string' as const,
- format: 'url',
- nullable: true as const, optional: false as const,
- },
- avatarBlurhash: {
- type: 'any' as const,
- nullable: true as const, optional: false as const,
- },
- avatarColor: {
- type: 'any' as const,
- nullable: true as const, optional: false as const,
- default: null,
- },
- isAdmin: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- default: false,
- },
- isModerator: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- default: false,
- },
- isBot: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- isCat: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- emojis: {
- type: 'array' as const,
- nullable: false as const, optional: false as const,
- items: {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
- properties: {
- name: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- },
- url: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- format: 'url',
- },
- },
- },
- },
- url: {
- type: 'string' as const,
- format: 'url',
- nullable: true as const, optional: true as const,
- },
- createdAt: {
- type: 'string' as const,
- nullable: false as const, optional: true as const,
- format: 'date-time',
- },
- updatedAt: {
- type: 'string' as const,
- nullable: true as const, optional: true as const,
- format: 'date-time',
- },
- bannerUrl: {
- type: 'string' as const,
- format: 'url',
- nullable: true as const, optional: true as const,
- },
- bannerBlurhash: {
- type: 'any' as const,
- nullable: true as const, optional: true as const,
- },
- bannerColor: {
- type: 'any' as const,
- nullable: true as const, optional: true as const,
- default: null,
- },
- isLocked: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- isSuspended: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- example: false,
- },
- description: {
- type: 'string' as const,
- nullable: true as const, optional: true as const,
- example: 'Hi masters, I am Ai!',
- },
- location: {
- type: 'string' as const,
- nullable: true as const, optional: true as const,
- },
- birthday: {
- type: 'string' as const,
- nullable: true as const, optional: true as const,
- example: '2018-03-12',
- },
- fields: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- items: {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
- properties: {
- name: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- },
- value: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- },
- },
- maxLength: 4,
- },
- },
- followersCount: {
- type: 'number' as const,
- nullable: false as const, optional: true as const,
- },
- followingCount: {
- type: 'number' as const,
- nullable: false as const, optional: true as const,
- },
- notesCount: {
- type: 'number' as const,
- nullable: false as const, optional: true as const,
- },
- pinnedNoteIds: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- items: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
- format: 'id',
- },
- },
- pinnedNotes: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- items: {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
- ref: 'Note' as const,
- },
- },
- pinnedPageId: {
- type: 'string' as const,
- nullable: true as const, optional: true as const,
- },
- pinnedPage: {
- type: 'object' as const,
- nullable: true as const, optional: true as const,
- ref: 'Page' as const,
- },
- twoFactorEnabled: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- default: false,
- },
- usePasswordLessLogin: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- default: false,
- },
- securityKeys: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- default: false,
- },
- avatarId: {
- type: 'string' as const,
- nullable: true as const, optional: true as const,
- format: 'id',
- },
- bannerId: {
- type: 'string' as const,
- nullable: true as const, optional: true as const,
- format: 'id',
- },
- autoWatch: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- injectFeaturedNote: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- alwaysMarkNsfw: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- carefulBot: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- autoAcceptFollowed: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasUnreadSpecifiedNotes: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasUnreadMentions: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasUnreadAnnouncement: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasUnreadAntenna: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasUnreadChannel: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasUnreadMessagingMessage: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasUnreadNotification: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- hasPendingReceivedFollowRequest: {
- type: 'boolean' as const,
- nullable: false as const, optional: true as const,
- },
- integrations: {
- type: 'object' as const,
- nullable: false as const, optional: true as const,
- },
- mutedWords: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- },
- mutedInstances: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- },
- mutingNotificationTypes: {
- type: 'array' as const,
- nullable: false as const, optional: true as const,
- },
- isFollowing: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- hasPendingFollowRequestFromYou: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- hasPendingFollowRequestToYou: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- isFollowed: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- isBlocking: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- isBlocked: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- isMuted: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
- },
- },
-};
diff --git a/packages/backend/src/models/schema/antenna.ts b/packages/backend/src/models/schema/antenna.ts
new file mode 100644
index 0000000000..9cf522802c
--- /dev/null
+++ b/packages/backend/src/models/schema/antenna.ts
@@ -0,0 +1,89 @@
+export const packedAntennaSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ keywords: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ },
+ excludeKeywords: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ },
+ src: {
+ type: 'string',
+ optional: false, nullable: false,
+ enum: ['home', 'all', 'users', 'list', 'group'],
+ },
+ userListId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ },
+ userGroupId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ },
+ users: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ caseSensitive: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ default: false,
+ },
+ notify: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ withReplies: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ default: false,
+ },
+ withFile: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ hasUnreadNote: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ default: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/app.ts b/packages/backend/src/models/schema/app.ts
new file mode 100644
index 0000000000..c80dc81c33
--- /dev/null
+++ b/packages/backend/src/models/schema/app.ts
@@ -0,0 +1,33 @@
+export const packedAppSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ callbackUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ permission: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ secret: {
+ type: 'string',
+ optional: true, nullable: false,
+ },
+ isAuthorized: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/blocking.ts b/packages/backend/src/models/schema/blocking.ts
new file mode 100644
index 0000000000..5532322420
--- /dev/null
+++ b/packages/backend/src/models/schema/blocking.ts
@@ -0,0 +1,26 @@
+export const packedBlockingSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ blockeeId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ blockee: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/channel.ts b/packages/backend/src/models/schema/channel.ts
new file mode 100644
index 0000000000..7f4f2a48b8
--- /dev/null
+++ b/packages/backend/src/models/schema/channel.ts
@@ -0,0 +1,51 @@
+export const packedChannelSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ lastNotedAt: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'date-time',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ description: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ bannerUrl: {
+ type: 'string',
+ format: 'url',
+ nullable: true, optional: false,
+ },
+ notesCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ usersCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ isFollowing: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
+ userId: {
+ type: 'string',
+ nullable: true, optional: false,
+ format: 'id',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/clip.ts b/packages/backend/src/models/schema/clip.ts
new file mode 100644
index 0000000000..f0ee2ce0c4
--- /dev/null
+++ b/packages/backend/src/models/schema/clip.ts
@@ -0,0 +1,38 @@
+export const packedClipSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ userId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ isPublic: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/drive-file.ts b/packages/backend/src/models/schema/drive-file.ts
new file mode 100644
index 0000000000..4359076612
--- /dev/null
+++ b/packages/backend/src/models/schema/drive-file.ts
@@ -0,0 +1,107 @@
+export const packedDriveFileSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ example: 'lenna.jpg',
+ },
+ type: {
+ type: 'string',
+ optional: false, nullable: false,
+ example: 'image/jpeg',
+ },
+ md5: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'md5',
+ example: '15eca7fba0480996e2245f5185bf39f2',
+ },
+ size: {
+ type: 'number',
+ optional: false, nullable: false,
+ example: 51469,
+ },
+ isSensitive: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ blurhash: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ properties: {
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ width: {
+ type: 'number',
+ optional: true, nullable: false,
+ example: 1280,
+ },
+ height: {
+ type: 'number',
+ optional: true, nullable: false,
+ example: 720,
+ },
+ orientation: {
+ type: 'number',
+ optional: true, nullable: false,
+ example: 8,
+ },
+ avgColor: {
+ type: 'string',
+ optional: true, nullable: false,
+ example: 'rgb(40,65,87)',
+ },
+ },
+ },
+ url: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'url',
+ },
+ thumbnailUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'url',
+ },
+ comment: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ folderId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ folder: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'DriveFolder',
+ },
+ userId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ user: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'UserLite',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/drive-folder.ts b/packages/backend/src/models/schema/drive-folder.ts
new file mode 100644
index 0000000000..88cb8ab4a2
--- /dev/null
+++ b/packages/backend/src/models/schema/drive-folder.ts
@@ -0,0 +1,39 @@
+export const packedDriveFolderSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ foldersCount: {
+ type: 'number',
+ optional: true, nullable: false,
+ },
+ filesCount: {
+ type: 'number',
+ optional: true, nullable: false,
+ },
+ parentId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ parent: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'DriveFolder',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/emoji.ts b/packages/backend/src/models/schema/emoji.ts
new file mode 100644
index 0000000000..5f9af88db4
--- /dev/null
+++ b/packages/backend/src/models/schema/emoji.ts
@@ -0,0 +1,36 @@
+export const packedEmojiSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ aliases: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ category: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ host: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ url: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/federation-instance.ts b/packages/backend/src/models/schema/federation-instance.ts
new file mode 100644
index 0000000000..eef2f9e24f
--- /dev/null
+++ b/packages/backend/src/models/schema/federation-instance.ts
@@ -0,0 +1,105 @@
+import config from "@/config";
+
+export const packedFederationInstanceSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ caughtAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ host: {
+ type: 'string',
+ optional: false, nullable: false,
+ example: 'misskey.example.com',
+ },
+ usersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ notesCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ followingCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ followersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ driveUsage: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ driveFiles: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ latestRequestSentAt: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'date-time',
+ },
+ lastCommunicatedAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ isNotResponding: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ isSuspended: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ softwareName: {
+ type: 'string',
+ optional: false, nullable: true,
+ example: 'misskey',
+ },
+ softwareVersion: {
+ type: 'string',
+ optional: false, nullable: true,
+ example: config.version,
+ },
+ openRegistrations: {
+ type: 'boolean',
+ optional: false, nullable: true,
+ example: true,
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ maintainerName: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ maintainerEmail: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ iconUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'url',
+ },
+ infoUpdatedAt: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'date-time',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/following.ts b/packages/backend/src/models/schema/following.ts
new file mode 100644
index 0000000000..2bcffbfc4d
--- /dev/null
+++ b/packages/backend/src/models/schema/following.ts
@@ -0,0 +1,36 @@
+export const packedFollowingSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ followeeId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ followee: {
+ type: 'object',
+ optional: true, nullable: false,
+ ref: 'UserDetailed',
+ },
+ followerId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ follower: {
+ type: 'object',
+ optional: true, nullable: false,
+ ref: 'UserDetailed',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/gallery-post.ts b/packages/backend/src/models/schema/gallery-post.ts
new file mode 100644
index 0000000000..fc503d4a64
--- /dev/null
+++ b/packages/backend/src/models/schema/gallery-post.ts
@@ -0,0 +1,69 @@
+export const packedGalleryPostSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ updatedAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ title: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ userId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
+ fileIds: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ files: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'DriveFile',
+ },
+ },
+ tags: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ isSensitive: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/hashtag.ts b/packages/backend/src/models/schema/hashtag.ts
new file mode 100644
index 0000000000..98f8827640
--- /dev/null
+++ b/packages/backend/src/models/schema/hashtag.ts
@@ -0,0 +1,34 @@
+export const packedHashtagSchema = {
+ type: 'object',
+ properties: {
+ tag: {
+ type: 'string',
+ optional: false, nullable: false,
+ example: 'misskey',
+ },
+ mentionedUsersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ mentionedLocalUsersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ mentionedRemoteUsersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ attachedUsersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ attachedLocalUsersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ attachedRemoteUsersCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/messaging-message.ts b/packages/backend/src/models/schema/messaging-message.ts
new file mode 100644
index 0000000000..b1ffa45955
--- /dev/null
+++ b/packages/backend/src/models/schema/messaging-message.ts
@@ -0,0 +1,73 @@
+export const packedMessagingMessageSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ userId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: true, nullable: false,
+ },
+ text: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ fileId: {
+ type: 'string',
+ optional: true, nullable: true,
+ format: 'id',
+ },
+ file: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'DriveFile',
+ },
+ recipientId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ },
+ recipient: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'UserLite',
+ },
+ groupId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ },
+ group: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'UserGroup',
+ },
+ isRead: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
+ reads: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/muting.ts b/packages/backend/src/models/schema/muting.ts
new file mode 100644
index 0000000000..d75a4fbfed
--- /dev/null
+++ b/packages/backend/src/models/schema/muting.ts
@@ -0,0 +1,26 @@
+export const packedMutingSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ muteeId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ mutee: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/note-favorite.ts b/packages/backend/src/models/schema/note-favorite.ts
new file mode 100644
index 0000000000..d133f7367d
--- /dev/null
+++ b/packages/backend/src/models/schema/note-favorite.ts
@@ -0,0 +1,26 @@
+export const packedNoteFavoriteSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ note: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Note',
+ },
+ noteId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/note-reaction.ts b/packages/backend/src/models/schema/note-reaction.ts
new file mode 100644
index 0000000000..0d8fc5449b
--- /dev/null
+++ b/packages/backend/src/models/schema/note-reaction.ts
@@ -0,0 +1,25 @@
+export const packedNoteReactionSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ user: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserLite',
+ },
+ type: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/note.ts b/packages/backend/src/models/schema/note.ts
new file mode 100644
index 0000000000..cdf4b9a544
--- /dev/null
+++ b/packages/backend/src/models/schema/note.ts
@@ -0,0 +1,183 @@
+export const packedNoteSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ text: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ cw: {
+ type: 'string',
+ optional: true, nullable: true,
+ },
+ userId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
+ replyId: {
+ type: 'string',
+ optional: true, nullable: true,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ renoteId: {
+ type: 'string',
+ optional: true, nullable: true,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ reply: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'Note',
+ },
+ renote: {
+ type: 'object',
+ optional: true, nullable: true,
+ ref: 'Note',
+ },
+ isHidden: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
+ visibility: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ mentions: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ visibleUserIds: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ fileIds: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ files: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'DriveFile',
+ },
+ },
+ tags: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ poll: {
+ type: 'object',
+ optional: true, nullable: true,
+ },
+ channelId: {
+ type: 'string',
+ optional: true, nullable: true,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ channel: {
+ type: 'object',
+ optional: true, nullable: true,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ },
+ },
+ },
+ localOnly: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
+ emojis: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ url: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ },
+ },
+ },
+ reactions: {
+ type: 'object',
+ optional: false, nullable: false,
+ },
+ renoteCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ repliesCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ uri: {
+ type: 'string',
+ optional: true, nullable: false,
+ },
+ url: {
+ type: 'string',
+ optional: true, nullable: false,
+ },
+
+ myReaction: {
+ type: 'object',
+ optional: true, nullable: true,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/notification.ts b/packages/backend/src/models/schema/notification.ts
new file mode 100644
index 0000000000..f3c293c480
--- /dev/null
+++ b/packages/backend/src/models/schema/notification.ts
@@ -0,0 +1,66 @@
+import { notificationTypes } from "@/types";
+
+export const packedNotificationSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ isRead: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ type: {
+ type: 'string',
+ optional: false, nullable: false,
+ enum: [...notificationTypes],
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: true, nullable: true,
+ },
+ userId: {
+ type: 'string',
+ optional: true, nullable: true,
+ format: 'id',
+ },
+ note: {
+ type: 'object',
+ ref: 'Note',
+ optional: true, nullable: true,
+ },
+ reaction: {
+ type: 'string',
+ optional: true, nullable: true,
+ },
+ choice: {
+ type: 'number',
+ optional: true, nullable: true,
+ },
+ invitation: {
+ type: 'object',
+ optional: true, nullable: true,
+ },
+ body: {
+ type: 'string',
+ optional: true, nullable: true,
+ },
+ header: {
+ type: 'string',
+ optional: true, nullable: true,
+ },
+ icon: {
+ type: 'string',
+ optional: true, nullable: true,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/page.ts b/packages/backend/src/models/schema/page.ts
new file mode 100644
index 0000000000..55ba3ce7f7
--- /dev/null
+++ b/packages/backend/src/models/schema/page.ts
@@ -0,0 +1,51 @@
+export const packedPageSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ updatedAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ title: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ summary: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ content: {
+ type: 'array',
+ optional: false, nullable: false,
+ },
+ variables: {
+ type: 'array',
+ optional: false, nullable: false,
+ },
+ userId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/queue.ts b/packages/backend/src/models/schema/queue.ts
new file mode 100644
index 0000000000..7ceeda26af
--- /dev/null
+++ b/packages/backend/src/models/schema/queue.ts
@@ -0,0 +1,25 @@
+export const packedQueueCountSchema = {
+ type: 'object',
+ properties: {
+ waiting: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ active: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ completed: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ failed: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ delayed: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/user-group.ts b/packages/backend/src/models/schema/user-group.ts
new file mode 100644
index 0000000000..a73bf82bb8
--- /dev/null
+++ b/packages/backend/src/models/schema/user-group.ts
@@ -0,0 +1,34 @@
+export const packedUserGroupSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ ownerId: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'id',
+ },
+ userIds: {
+ type: 'array',
+ nullable: false, optional: true,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'id',
+ },
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/user-list.ts b/packages/backend/src/models/schema/user-list.ts
new file mode 100644
index 0000000000..3ba5dc4a8a
--- /dev/null
+++ b/packages/backend/src/models/schema/user-list.ts
@@ -0,0 +1,29 @@
+export const packedUserListSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ userIds: {
+ type: 'array',
+ nullable: false, optional: true,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'id',
+ },
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/schema/user.ts b/packages/backend/src/models/schema/user.ts
new file mode 100644
index 0000000000..616bedc0dc
--- /dev/null
+++ b/packages/backend/src/models/schema/user.ts
@@ -0,0 +1,467 @@
+export const packedUserLiteSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ name: {
+ type: 'string',
+ nullable: true, optional: false,
+ example: 'è—',
+ },
+ username: {
+ type: 'string',
+ nullable: false, optional: false,
+ example: 'ai',
+ },
+ host: {
+ type: 'string',
+ nullable: true, optional: false,
+ example: 'misskey.example.com',
+ },
+ avatarUrl: {
+ type: 'string',
+ format: 'url',
+ nullable: true, optional: false,
+ },
+ avatarBlurhash: {
+ type: 'any',
+ nullable: true, optional: false,
+ },
+ avatarColor: {
+ type: 'any',
+ nullable: true, optional: false,
+ default: null,
+ },
+ isAdmin: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ default: false,
+ },
+ isModerator: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ default: false,
+ },
+ isBot: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ isCat: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ emojis: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ properties: {
+ name: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ url: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'url',
+ },
+ },
+ },
+ },
+ onlineStatus: {
+ type: 'string',
+ format: 'url',
+ nullable: true, optional: false,
+ enum: ['unknown', 'online', 'active', 'offline'],
+ },
+ },
+} as const;
+
+export const packedUserDetailedNotMeOnlySchema = {
+ type: 'object',
+ properties: {
+ url: {
+ type: 'string',
+ format: 'url',
+ nullable: true, optional: false,
+ },
+ uri: {
+ type: 'string',
+ format: 'uri',
+ nullable: true, optional: false,
+ },
+ createdAt: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'date-time',
+ },
+ updatedAt: {
+ type: 'string',
+ nullable: true, optional: false,
+ format: 'date-time',
+ },
+ lastFetchedAt: {
+ type: 'string',
+ nullable: true, optional: false,
+ format: 'date-time',
+ },
+ bannerUrl: {
+ type: 'string',
+ format: 'url',
+ nullable: true, optional: false,
+ },
+ bannerBlurhash: {
+ type: 'any',
+ nullable: true, optional: false,
+ },
+ bannerColor: {
+ type: 'any',
+ nullable: true, optional: false,
+ default: null,
+ },
+ isLocked: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ isSilenced: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ isSuspended: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ example: false,
+ },
+ description: {
+ type: 'string',
+ nullable: true, optional: false,
+ example: 'Hi masters, I am Ai!',
+ },
+ location: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ birthday: {
+ type: 'string',
+ nullable: true, optional: false,
+ example: '2018-03-12',
+ },
+ lang: {
+ type: 'string',
+ nullable: true, optional: false,
+ example: 'ja-JP',
+ },
+ fields: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ properties: {
+ name: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ value: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ },
+ maxLength: 4,
+ },
+ },
+ followersCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ followingCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ notesCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ pinnedNoteIds: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'id',
+ },
+ },
+ pinnedNotes: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ ref: 'Note',
+ },
+ },
+ pinnedPageId: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ pinnedPage: {
+ type: 'object',
+ nullable: true, optional: false,
+ ref: 'Page',
+ },
+ publicReactions: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ twoFactorEnabled: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ default: false,
+ },
+ usePasswordLessLogin: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ default: false,
+ },
+ securityKeys: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ default: false,
+ },
+ //#region relations
+ isFollowing: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ isFollowed: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ hasPendingFollowRequestFromYou: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ hasPendingFollowRequestToYou: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ isBlocking: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ isBlocked: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ isMuted: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ //#endregion
+ },
+} as const;
+
+export const packedMeDetailedOnlySchema = {
+ type: 'object',
+ properties: {
+ avatarId: {
+ type: 'string',
+ nullable: true, optional: false,
+ format: 'id',
+ },
+ bannerId: {
+ type: 'string',
+ nullable: true, optional: false,
+ format: 'id',
+ },
+ injectFeaturedNote: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
+ receiveAnnouncementEmail: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
+ alwaysMarkNsfw: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
+ carefulBot: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
+ autoAcceptFollowed: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
+ noCrawle: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
+ isExplorable: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ isDeleted: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hideOnlineStatus: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasUnreadSpecifiedNotes: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasUnreadMentions: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasUnreadAnnouncement: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasUnreadAntenna: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasUnreadChannel: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasUnreadMessagingMessage: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasUnreadNotification: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ hasPendingReceivedFollowRequest: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ integrations: {
+ type: 'object',
+ nullable: true, optional: false,
+ },
+ mutedWords: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ },
+ },
+ mutedInstances: {
+ type: 'array',
+ nullable: true, optional: false,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ },
+ mutingNotificationTypes: {
+ type: 'array',
+ nullable: true, optional: false,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ },
+ emailNotificationTypes: {
+ type: 'array',
+ nullable: true, optional: false,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ },
+ //#region secrets
+ email: {
+ type: 'string',
+ nullable: true, optional: true,
+ },
+ emailVerified: {
+ type: 'boolean',
+ nullable: true, optional: true,
+ },
+ securityKeysList: {
+ type: 'array',
+ nullable: false, optional: true,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ },
+ },
+ //#endregion
+ },
+} as const;
+
+export const packedUserDetailedNotMeSchema = {
+ type: 'object',
+ allOf: [
+ {
+ type: 'object',
+ ref: 'UserLite',
+ },
+ {
+ type: 'object',
+ ref: 'UserDetailedNotMeOnly',
+ },
+ ],
+} as const;
+
+export const packedMeDetailedSchema = {
+ type: 'object',
+ allOf: [
+ {
+ type: 'object',
+ ref: 'UserLite',
+ },
+ {
+ type: 'object',
+ ref: 'UserDetailedNotMeOnly',
+ },
+ {
+ type: 'object',
+ ref: 'MeDetailedOnly',
+ },
+ ],
+} as const;
+
+export const packedUserDetailedSchema = {
+ oneOf: [
+ {
+ type: 'object',
+ ref: 'UserDetailedNotMe',
+ },
+ {
+ type: 'object',
+ ref: 'MeDetailed',
+ },
+ ],
+} as const;
+
+export const packedUserSchema = {
+ oneOf: [
+ {
+ type: 'object',
+ ref: 'UserLite',
+ },
+ {
+ type: 'object',
+ ref: 'UserDetailed',
+ },
+ ],
+} as const;
diff --git a/packages/backend/src/prelude/await-all.ts b/packages/backend/src/prelude/await-all.ts
index 24795f3ae5..b955c3a5d8 100644
--- a/packages/backend/src/prelude/await-all.ts
+++ b/packages/backend/src/prelude/await-all.ts
@@ -1,13 +1,11 @@
-type Await<T> = T extends Promise<infer U> ? U : T;
-
-type AwaitAll<T> = {
- [P in keyof T]: Await<T[P]>;
+export type Promiseable<T> = {
+ [K in keyof T]: Promise<T[K]> | T[K];
};
-export async function awaitAll<T>(obj: T): Promise<AwaitAll<T>> {
- const target = {} as any;
- const keys = Object.keys(obj);
- const values = Object.values(obj);
+export async function awaitAll<T>(obj: Promiseable<T>): Promise<T> {
+ const target = {} as T;
+ const keys = Object.keys(obj) as unknown as (keyof T)[];
+ const values = Object.values(obj) as any[];
const resolvedValues = await Promise.all(values.map(value =>
(!value || !value.constructor || value.constructor.name !== 'Object')
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index a61b3f564c..bb4e972b8e 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -3,7 +3,7 @@ import { dirname } from 'path';
import { Context } from 'cafy';
import * as path from 'path';
import * as glob from 'glob';
-import { SimpleSchema } from '@/misc/simple-schema';
+import { Schema } from '@/misc/schema';
//const _filename = fileURLToPath(import.meta.url);
const _filename = __filename;
@@ -18,87 +18,87 @@ export type Param = {
};
export interface IEndpointMeta {
- stability?: string; //'deprecated' | 'experimental' | 'stable';
+ readonly stability?: 'deprecated' | 'experimental' | 'stable';
- tags?: string[];
+ readonly tags?: ReadonlyArray<string>;
- params?: {
- [key: string]: Param;
+ readonly params?: {
+ readonly [key: string]: Param;
};
- errors?: {
- [key: string]: {
- message: string;
- code: string;
- id: string;
+ readonly errors?: {
+ readonly [key: string]: {
+ readonly message: string;
+ readonly code: string;
+ readonly id: string;
};
};
- res?: SimpleSchema;
+ readonly res?: Schema;
/**
* ã“ã®ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆã«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã™ã‚‹ã®ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼æƒ…å ±ãŒå¿…é ˆã‹å¦ã‹
* çœç•¥ã—ãŸå ´åˆã¯ false ã¨ã—ã¦è§£é‡ˆã•ã‚Œã¾ã™ã€‚
*/
- requireCredential?: boolean;
+ readonly requireCredential?: boolean;
/**
* 管ç†è€…ã®ã¿ä½¿ãˆã‚‹ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆã‹å¦ã‹
*/
- requireAdmin?: boolean;
+ readonly requireAdmin?: boolean;
/**
* 管ç†è€…ã¾ãŸã¯ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ãƒ¼ã®ã¿ä½¿ãˆã‚‹ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆã‹å¦ã‹
*/
- requireModerator?: boolean;
+ readonly requireModerator?: boolean;
/**
* エンドãƒã‚¤ãƒ³ãƒˆã®ãƒªãƒŸãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã«é–¢ã™ã‚‹ã‚„ã¤
* çœç•¥ã—ãŸå ´åˆã¯ãƒªãƒŸãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã¯ç„¡ã„ã‚‚ã®ã¨ã—ã¦è§£é‡ˆã•ã‚Œã¾ã™ã€‚
* ã¾ãŸã€withCredential ㌠false ã®å ´åˆã¯ãƒªãƒŸãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¡Œã†ã“ã¨ã¯ã§ãã¾ã›ã‚“。
*/
- limit?: {
+ readonly limit?: {
/**
* 複数ã®ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆã§ãƒªãƒŸãƒƒãƒˆã‚’共有ã—ãŸã„å ´åˆã«æŒ‡å®šã™ã‚‹ã‚ー
*/
- key?: string;
+ readonly key?: string;
/**
* リミットをé©ç”¨ã™ã‚‹æœŸé–“(ms)
* ã“ã®ãƒ—ãƒãƒ‘ティをè¨å®šã™ã‚‹å ´åˆã€max プãƒãƒ‘ティもè¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
*/
- duration?: number;
+ readonly duration?: number;
/**
* durationã§æŒ‡å®šã—ãŸæœŸé–“内ã«ã„ãã¤ã¾ã§ãƒªã‚¯ã‚¨ã‚¹ãƒˆã§ãã‚‹ã®ã‹
* ã“ã®ãƒ—ãƒãƒ‘ティをè¨å®šã™ã‚‹å ´åˆã€duration プãƒãƒ‘ティもè¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
*/
- max?: number;
+ readonly max?: number;
/**
* 最低ã§ã‚‚ã©ã‚Œãらã„ã®é–“隔を開ã‘ã¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ãªã‘ã‚Œã°ãªã‚‰ãªã„ã‹(ms)
*/
- minInterval?: number;
+ readonly minInterval?: number;
};
/**
* ファイルã®æ·»ä»˜ã‚’å¿…è¦ã¨ã™ã‚‹ã‹å¦ã‹
* çœç•¥ã—ãŸå ´åˆã¯ false ã¨ã—ã¦è§£é‡ˆã•ã‚Œã¾ã™ã€‚
*/
- requireFile?: boolean;
+ readonly requireFile?: boolean;
/**
* サードパーティアプリã‹ã‚‰ã¯ãƒªã‚¯ã‚¨ã‚¹ãƒˆã™ã‚‹ã“ã¨ãŒã§ããªã„ã‹å¦ã‹
* çœç•¥ã—ãŸå ´åˆã¯ false ã¨ã—ã¦è§£é‡ˆã•ã‚Œã¾ã™ã€‚
*/
- secure?: boolean;
+ readonly secure?: boolean;
/**
* エンドãƒã‚¤ãƒ³ãƒˆã®ç¨®é¡ž
* パーミッションã®å®Ÿç¾ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚
*/
- kind?: string;
+ readonly kind?: string;
}
export interface IEndpoint {
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 5d4cc2c044..807afd2690 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
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -49,66 +49,66 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
format: 'id',
example: 'xxxxxxxxxx',
},
createdAt: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
format: 'date-time',
},
comment: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
},
resolved: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
example: false,
},
reporterId: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
format: 'id',
},
targetUserId: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
format: 'id',
},
assigneeId: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
format: 'id',
},
reporter: {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
+ type: 'object',
+ nullable: false, optional: false,
ref: 'User',
},
targetUser: {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
+ type: 'object',
+ nullable: false, optional: false,
ref: 'User',
},
assignee: {
- type: 'object' as const,
- nullable: true as const, optional: true as const,
+ type: 'object',
+ nullable: true, optional: true,
ref: 'User',
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 edfac244f5..20f1232959 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
@@ -16,17 +16,17 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'User',
properties: {
token: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, _me) => {
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 3ed6ac2f33..1701c1e3a7 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
@@ -9,7 +9,7 @@ import { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -17,7 +17,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 3388ef2726..00ad2012fe 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 { genId } from '@/misc/gen-id';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -32,7 +32,7 @@ export const meta = {
validator: $.str.min(1),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 ab0458af6e..c0124e2484 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts
@@ -7,7 +7,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -23,7 +23,7 @@ export const meta = {
id: 'ccac9863-3a03-416e-b899-8a64041118b1',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 04597ec7b5..7a83637f3b 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../../common/make-pagination-query';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -24,7 +24,7 @@ export const meta = {
validator: $.optional.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 7fab745ef7..c2b09ab9cf 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/update.ts
@@ -7,7 +7,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -44,7 +44,7 @@ export const meta = {
id: 'b7aa1727-1354-47bc-a182-3a9c3973d300',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 7d169d6caf..24c4caa37d 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 { genId } from '@/misc/gen-id';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -22,40 +22,40 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
example: 'xxxxxxxxxx',
},
createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'date-time',
},
updatedAt: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'date-time',
},
title: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
text: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
imageUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 81dd8cfc59..5548f99006 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
@@ -7,7 +7,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -23,7 +23,7 @@ export const meta = {
id: 'ecad8040-a276-4e85-bda9-015a708d291e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 f6ad6d36f4..e5cc53ccdd 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../../common/make-pagination-query';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -26,48 +26,48 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
example: 'xxxxxxxxxx',
},
createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'date-time',
},
updatedAt: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'date-time',
},
text: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
title: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
imageUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
reads: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 6fb4b571ad..f66293bb18 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
@@ -7,7 +7,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -32,7 +32,7 @@ export const meta = {
id: 'd3aae5a7-6372-4cb4-b61c-f511ffc2d7cc',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 82cbe7b194..249e63a0f8 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
@@ -7,7 +7,7 @@ import { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -15,7 +15,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/admin/delete-logs.ts b/packages/backend/src/server/api/endpoints/admin/delete-logs.ts
deleted file mode 100644
index 197ad01cb3..0000000000
--- a/packages/backend/src/server/api/endpoints/admin/delete-logs.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import define from '../../define';
-import { Logs } from '@/models/index';
-
-export const meta = {
- tags: ['admin'],
-
- requireCredential: true as const,
- requireModerator: true,
-};
-
-// eslint-disable-next-line import/no-default-export
-export default define(meta, async (ps) => {
- await Logs.clear(); // TRUNCATE
-});
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 518535fdde..acabbfef5c 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
@@ -4,9 +4,9 @@ import { createCleanRemoteFilesJob } from '@/queue/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 a523c5b398..452e7069a8 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
@@ -6,9 +6,9 @@ import { DriveFiles } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 b90ad90440..264f549867 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 { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['admin'],
- requireCredential: false as const,
+ requireCredential: false,
requireModerator: true,
params: {
@@ -44,15 +44,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 bc0857588c..5d9a1f2703 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 { DriveFiles } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -29,137 +29,137 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
example: 'xxxxxxxxxx',
},
createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'date-time',
},
userId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'id',
example: 'xxxxxxxxxx',
},
userHost: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
md5: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'md5',
example: '15eca7fba0480996e2245f5185bf39f2',
},
name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
example: 'lenna.jpg',
},
type: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
example: 'image/jpeg',
},
size: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
example: 51469,
},
comment: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
blurhash: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
properties: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
width: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
example: 1280,
},
height: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
example: 720,
},
avgColor: {
- type: 'string' as const,
- optional: true as const, nullable: false as const,
+ type: 'string',
+ optional: true, nullable: false,
example: 'rgb(40,65,87)',
},
},
},
storedInternal: {
- type: 'boolean' as const,
- optional: false as const, nullable: true as const,
+ type: 'boolean',
+ optional: false, nullable: true,
example: true,
},
url: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'url',
},
thumbnailUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'url',
},
webpublicUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'url',
},
accessKey: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
thumbnailAccessKey: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
webpublicAccessKey: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
uri: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
src: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
folderId: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'id',
example: 'xxxxxxxxxx',
},
isSensitive: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isLink: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 ef0f315022..f0fd73c276 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
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -20,7 +20,7 @@ export const meta = {
validator: $.arr($.str),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 f7a0fdb875..72adda9dcb 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -12,7 +12,7 @@ import { publishBroadcastStream } from '@/services/stream';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -28,7 +28,7 @@ export const meta = {
id: 'fc46b5a4-6b92-4c33-ac66-b806659bb5cf',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 6dc7d1bd97..de239c4f0d 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
@@ -12,7 +12,7 @@ import { publishBroadcastStream } from '@/services/stream';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -30,17 +30,17 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 a99cd3c978..797a5de672 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
@@ -9,7 +9,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -17,7 +17,7 @@ export const meta = {
validator: $.arr($.type(ID)),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 870245ac92..1580439024 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
@@ -9,7 +9,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -25,7 +25,7 @@ export const meta = {
id: 'be83669b-773a-44b7-b1f8-e5e5170ac3c2',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 04895b8f20..8856a38f24 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,14 +6,14 @@ import { ID } from '@/misc/cafy-id';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
fileId: {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 42b6cb1fcf..6e502547f5 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
@@ -8,7 +8,7 @@ import { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -37,45 +37,45 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
aliases: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
category: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
host: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
url: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 5026af914a..76ef190f94 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -8,7 +8,7 @@ import { Emoji } from '@/models/entities/emoji';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -32,45 +32,45 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
aliases: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
category: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
host: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
url: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 4c771b4e42..c49f84b7fb 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
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -20,7 +20,7 @@ export const meta = {
validator: $.arr($.str),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 33dccbc642..06197820f0 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
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -20,7 +20,7 @@ export const meta = {
validator: $.arr($.str),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 d40ed52da7..f0645f111b 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
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -20,7 +20,7 @@ export const meta = {
validator: $.optional.nullable.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 391887257a..54a2cf9517 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -36,7 +36,7 @@ export const meta = {
id: '684dec9d-a8c2-4364-9aa8-456c49cb1dc8',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 9046196838..db023c6f0b 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 { DriveFiles } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -14,7 +14,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 d9e3900a29..b68252ef2e 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
@@ -7,7 +7,7 @@ import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -15,7 +15,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 485bbe7d58..4de8ad1336 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 { Followings, Users } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -14,7 +14,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 3ddccecc6a..6ac2f1f467 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 { toPuny } from '@/misc/convert-host';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -18,7 +18,7 @@ export const meta = {
validator: $.bool,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 877e67aa79..9a2bccec77 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
@@ -2,14 +2,14 @@ import define from '../../define';
import { getConnection } from 'typeorm';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
tags: ['admin'],
params: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
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 5d4ea9c444..1c5f250676 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
@@ -2,7 +2,7 @@ import define from '../../define';
import { getConnection } from 'typeorm';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
tags: ['admin'],
@@ -11,8 +11,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
example: {
migrations: {
count: 66,
@@ -20,7 +20,7 @@ export const meta = {
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
diff --git a/packages/backend/src/server/api/endpoints/admin/invite.ts b/packages/backend/src/server/api/endpoints/admin/invite.ts
index 1c8c51434b..3428709c04 100644
--- a/packages/backend/src/server/api/endpoints/admin/invite.ts
+++ b/packages/backend/src/server/api/endpoints/admin/invite.ts
@@ -6,25 +6,25 @@ import { genId } from '@/misc/gen-id';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
code: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
example: '2ERUA5VR',
maxLength: 8,
minLength: 8,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
index ea795895f2..0308cf2761 100644
--- a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
@@ -6,7 +6,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireAdmin: true,
params: {
@@ -14,7 +14,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
index 25f237d81f..bdb976e9ec 100644
--- a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
+++ b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
@@ -6,7 +6,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireAdmin: true,
params: {
@@ -14,7 +14,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 1bd54ba890..f2735ac9f8 100644
--- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts
@@ -8,7 +8,7 @@ import { PromoNotes } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -34,7 +34,7 @@ export const meta = {
id: 'ae427aa2-7a41-484f-a18c-2c1104051604',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 8a91168ece..3c8e7a27a2 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
@@ -5,11 +5,11 @@ import { insertModerationLog } from '@/services/insert-moderation-log';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 2c867463e3..4760e2c310 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
@@ -5,25 +5,25 @@ import define from '../../../define';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
anyOf: [
{
- type: 'string' as const,
+ type: 'string',
},
{
- type: 'number' as const,
+ type: 'number',
},
],
},
@@ -33,7 +33,7 @@ export const meta = {
12,
]],
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 974e680121..a95aabc506 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
@@ -5,25 +5,25 @@ import { inboxQueue } from '@/queue/queues';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
anyOf: [
{
- type: 'string' as const,
+ type: 'string',
},
{
- type: 'number' as const,
+ type: 'number',
},
],
},
@@ -33,7 +33,7 @@ export const meta = {
12,
]],
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
index 70649e0675..df0b4a8f13 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
@@ -5,7 +5,7 @@ import define from '../../../define';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -24,37 +24,37 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
data: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
},
attempts: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
maxAttempts: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
timestamp: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 5de871a60a..dab0be5dbc 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
@@ -4,30 +4,34 @@ import define from '../../../define';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
deliver: {
+ optional: false, nullable: false,
ref: 'QueueCount',
},
inbox: {
+ optional: false, nullable: false,
ref: 'QueueCount',
},
db: {
+ optional: false, nullable: false,
ref: 'QueueCount',
},
objectStorage: {
+ optional: false, nullable: false,
ref: 'QueueCount',
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 c4a0f13028..65890a00f7 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/add.ts
@@ -7,8 +7,8 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
- requireModerator: true as const,
+ requireCredential: true,
+ requireModerator: true,
params: {
inbox: {
@@ -25,22 +25,22 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
inbox: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'url',
},
status: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
default: 'requesting',
enum: [
'requesting',
@@ -50,7 +50,7 @@ export const meta = {
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 1e8afd783d..bdddf13374 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/list.ts
@@ -4,32 +4,32 @@ import { listRelay } from '@/services/relay';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
- requireModerator: true as const,
+ requireCredential: true,
+ requireModerator: true,
params: {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
inbox: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'url',
},
status: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
default: 'requesting',
enum: [
'requesting',
@@ -40,7 +40,7 @@ export const meta = {
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 293de2b91b..4b04e620c1 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
@@ -5,15 +5,15 @@ import { removeRelay } from '@/services/relay';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
- requireModerator: true as const,
+ requireCredential: true,
+ requireModerator: true,
params: {
inbox: {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 227bcbab91..b6cf1ee2d0 100644
--- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts
@@ -8,7 +8,7 @@ import { Users, UserProfiles } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -18,18 +18,18 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
password: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
minLength: 8,
maxLength: 8,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 a189c3e99b..3b47d7d35e 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 { AbuseUserReports } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -14,7 +14,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/admin/resync-chart.ts b/packages/backend/src/server/api/endpoints/admin/resync-chart.ts
index 49d41cd8c2..d80d2b0426 100644
--- a/packages/backend/src/server/api/endpoints/admin/resync-chart.ts
+++ b/packages/backend/src/server/api/endpoints/admin/resync-chart.ts
@@ -5,9 +5,9 @@ import { insertModerationLog } from '@/services/insert-moderation-log';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 74ec98f75d..c2972c35fa 100644
--- a/packages/backend/src/server/api/endpoints/admin/send-email.ts
+++ b/packages/backend/src/server/api/endpoints/admin/send-email.ts
@@ -5,7 +5,7 @@ import { sendEmail } from '@/services/send-email';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -19,7 +19,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 9346c5dd2c..cd282e364c 100644
--- a/packages/backend/src/server/api/endpoints/admin/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/admin/server-info.ts
@@ -5,7 +5,7 @@ import define from '../../define';
import { redisClient } from '../../../../db/redis';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
tags: ['admin', 'meta'],
@@ -14,81 +14,81 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
machine: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
os: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
example: 'linux',
},
node: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
psql: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
cpu: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
model: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
cores: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
mem: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
total: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
format: 'bytes',
},
},
},
fs: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
total: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
format: 'bytes',
},
used: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
format: 'bytes',
},
},
},
net: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
interface: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
example: 'eth0',
},
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
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 0d3759a84b..84e2b84bb5 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
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -26,44 +26,44 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'date-time',
},
type: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
info: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
},
userId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
user: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 7ac922ca7e..c2a6a294b5 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -6,7 +6,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -16,148 +16,148 @@ export const meta = {
},
res: {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
+ type: 'object',
+ nullable: false, optional: false,
properties: {
id: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
format: 'id',
},
createdAt: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
format: 'date-time',
},
updatedAt: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
format: 'date-time',
},
lastFetchedAt: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
username: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
},
name: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
folowersCount: {
- type: 'number' as const,
- nullable: false as const, optional: false as const,
+ type: 'number',
+ nullable: false, optional: true,
},
followingCount: {
- type: 'number' as const,
- nullable: false as const, optional: false as const,
+ type: 'number',
+ nullable: false, optional: false,
},
notesCount: {
- type: 'number' as const,
- nullable: false as const, optional: false as const,
+ type: 'number',
+ nullable: false, optional: false,
},
avatarId: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
bannerId: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
tags: {
- type: 'array' as const,
- nullable: false as const, optional: false as const,
+ type: 'array',
+ nullable: false, optional: false,
items: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
},
},
avatarUrl: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
format: 'url',
},
bannerUrl: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
format: 'url',
},
avatarBlurhash: {
- type: 'any' as const,
- nullable: true as const, optional: false as const,
+ type: 'any',
+ nullable: true, optional: false,
default: null,
},
bannerBlurhash: {
- type: 'any' as const,
- nullable: true as const, optional: false as const,
+ type: 'any',
+ nullable: true, optional: false,
default: null,
},
isSuspended: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
},
isSilenced: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
},
isLocked: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
},
isBot: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
},
isCat: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
},
isAdmin: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
},
isModerator: {
- type: 'boolean' as const,
- nullable: false as const, optional: false as const,
+ type: 'boolean',
+ nullable: false, optional: false,
},
emojis: {
- type: 'array' as const,
- nullable: false as const, optional: false as const,
+ type: 'array',
+ nullable: false, optional: false,
items: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: false, optional: false,
},
},
host: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
inbox: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
sharedInbox: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
featured: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
uri: {
- type: 'string' as const,
- nullable: true as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
},
token: {
- type: 'string' as const,
- nullable: false as const, optional: false as const,
+ type: 'string',
+ nullable: true, optional: false,
default: '<MASKED>',
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 507183e876..d3dde99b72 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts
@@ -5,7 +5,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -64,15 +64,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- nullable: false as const, optional: false as const,
+ type: 'array',
+ nullable: false, optional: false,
items: {
- type: 'object' as const,
- nullable: false as const, optional: false as const,
- ref: 'User',
+ type: 'object',
+ nullable: false, optional: false,
+ ref: 'UserDetailed',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/admin/silence-user.ts b/packages/backend/src/server/api/endpoints/admin/silence-user.ts
index b4a1ddcc0f..872bd2a6ac 100644
--- a/packages/backend/src/server/api/endpoints/admin/silence-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/silence-user.ts
@@ -7,7 +7,7 @@ import { insertModerationLog } from '@/services/insert-moderation-log';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -15,7 +15,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 95771e0c32..2bb1875fc0 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -11,7 +11,7 @@ import { publishUserEvent } from '@/services/stream';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -19,7 +19,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
index e04960a4ec..a4c6ff2ade 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
@@ -7,7 +7,7 @@ import { insertModerationLog } from '@/services/insert-moderation-log';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -15,7 +15,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 0a6ceadab9..5ab56d51c7 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -8,7 +8,7 @@ import { doPostUnsuspend } from '@/services/unsuspend-user';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -16,7 +16,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 0d5455cd33..aa2d1222f7 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -9,7 +9,7 @@ import { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireAdmin: true,
params: {
@@ -297,7 +297,7 @@ export const meta = {
validator: $.optional.bool,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/admin/vacuum.ts b/packages/backend/src/server/api/endpoints/admin/vacuum.ts
index 798a51acc5..4229ef0d29 100644
--- a/packages/backend/src/server/api/endpoints/admin/vacuum.ts
+++ b/packages/backend/src/server/api/endpoints/admin/vacuum.ts
@@ -6,7 +6,7 @@ import { insertModerationLog } from '@/services/insert-moderation-log';
export const meta = {
tags: ['admin'],
- requireCredential: true as const,
+ requireCredential: true,
requireModerator: true,
params: {
@@ -17,7 +17,7 @@ export const meta = {
validator: $.bool,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts
index 122d04f17c..0bd29607d6 100644
--- a/packages/backend/src/server/api/endpoints/announcements.ts
+++ b/packages/backend/src/server/api/endpoints/announcements.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../common/make-pagination-query';
export const meta = {
tags: ['meta'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
limit: {
@@ -30,48 +30,48 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
example: 'xxxxxxxxxx',
},
createdAt: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'date-time',
},
updatedAt: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
format: 'date-time',
},
text: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
title: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
imageUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
isRead: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts
index b3276bd9cd..2092d177ba 100644
--- a/packages/backend/src/server/api/endpoints/antennas/create.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/create.ts
@@ -9,7 +9,7 @@ import { publishInternalEvent } from '@/services/stream';
export const meta = {
tags: ['antennas'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -74,11 +74,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Antenna',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/antennas/delete.ts b/packages/backend/src/server/api/endpoints/antennas/delete.ts
index c6da545400..b2793fc70d 100644
--- a/packages/backend/src/server/api/endpoints/antennas/delete.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/delete.ts
@@ -8,7 +8,7 @@ import { publishInternalEvent } from '@/services/stream';
export const meta = {
tags: ['antennas'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -25,7 +25,7 @@ export const meta = {
id: 'b34dcf9d-348f-44bb-99d0-6c9314cfe2df',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/antennas/list.ts b/packages/backend/src/server/api/endpoints/antennas/list.ts
index 1f24e0fb97..bb58912612 100644
--- a/packages/backend/src/server/api/endpoints/antennas/list.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/list.ts
@@ -4,20 +4,20 @@ import { Antennas } from '@/models/index';
export const meta = {
tags: ['antennas', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Antenna',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index 09500a38dc..eb7de901c5 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -12,7 +12,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['antennas', 'account', 'notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
@@ -52,15 +52,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/antennas/show.ts b/packages/backend/src/server/api/endpoints/antennas/show.ts
index a02c44ac2b..a37d37d31c 100644
--- a/packages/backend/src/server/api/endpoints/antennas/show.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/show.ts
@@ -7,7 +7,7 @@ import { Antennas } from '@/models/index';
export const meta = {
tags: ['antennas', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
@@ -26,11 +26,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Antenna',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts
index 968f761a35..900f725505 100644
--- a/packages/backend/src/server/api/endpoints/antennas/update.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/update.ts
@@ -8,7 +8,7 @@ import { publishInternalEvent } from '@/services/stream';
export const meta = {
tags: ['antennas'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -83,11 +83,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Antenna',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/ap/get.ts b/packages/backend/src/server/api/endpoints/ap/get.ts
index 0acce9bdbc..ff8c677b91 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 ms from 'ms';
export const meta = {
tags: ['federation'],
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
@@ -24,10 +24,10 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index e4e13117e6..7d17d8edce 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -12,11 +12,12 @@ import { User } from '@/models/entities/user';
import { fetchMeta } from '@/misc/fetch-meta';
import { isActor, isPost, getApId } from '@/remote/activitypub/type';
import ms from 'ms';
+import { SchemaType } from '@/misc/schema';
export const meta = {
tags: ['federation'],
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
@@ -38,21 +39,41 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- properties: {
- type: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
- enum: ['User', 'Note'],
- },
- object: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ optional: false, nullable: false,
+ oneOf: [
+ {
+ type: 'object',
+ properties: {
+ type: {
+ type: 'string',
+ optional: false, nullable: false,
+ enum: ['User'],
+ },
+ object: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailedNotMe',
+ }
+ }
},
- },
+ {
+ type: 'object',
+ properties: {
+ type: {
+ type: 'string',
+ optional: false, nullable: false,
+ enum: ['Note'],
+ },
+ object: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Note',
+ }
+ }
+ }
+ ],
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
@@ -67,7 +88,7 @@ export default define(meta, async (ps) => {
/***
* URIã‹ã‚‰Userã‹Noteを解決ã™ã‚‹
*/
-async function fetchAny(uri: string) {
+async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | null> {
// URIãŒã“ã®ã‚µãƒ¼ãƒãƒ¼ã‚’指ã—ã¦ã„ã‚‹ãªã‚‰ã€ãƒãƒ¼ã‚«ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼IDã¨ã—ã¦DBã‹ã‚‰ãƒ•ã‚§ãƒƒãƒ
if (uri.startsWith(config.url + '/')) {
const parts = uri.split('/');
@@ -96,8 +117,8 @@ async function fetchAny(uri: string) {
}
// ブãƒãƒƒã‚¯ã—ã¦ãŸã‚‰ä¸æ–
- const meta = await fetchMeta();
- if (meta.blockedHosts.includes(extractDbHost(uri))) return null;
+ const fetchedMeta = await fetchMeta();
+ if (fetchedMeta.blockedHosts.includes(extractDbHost(uri))) return null;
// URI(AP Object id)ã¨ã—ã¦DB検索
{
@@ -172,7 +193,7 @@ async function fetchAny(uri: string) {
return null;
}
-async function mergePack(user: User | null | undefined, note: Note | null | undefined) {
+async function mergePack(user: User | null | undefined, note: Note | null | undefined): Promise<SchemaType<typeof meta.res> | null> {
if (user != null) {
return {
type: 'User',
diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts
index 88e5d866c2..838cbf606e 100644
--- a/packages/backend/src/server/api/endpoints/app/create.ts
+++ b/packages/backend/src/server/api/endpoints/app/create.ts
@@ -8,7 +8,7 @@ import { secureRndstr } from '@/misc/secure-rndstr';
export const meta = {
tags: ['app'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
name: {
@@ -31,11 +31,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'App',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/app/show.ts b/packages/backend/src/server/api/endpoints/app/show.ts
index 701a23b223..9f4777b383 100644
--- a/packages/backend/src/server/api/endpoints/app/show.ts
+++ b/packages/backend/src/server/api/endpoints/app/show.ts
@@ -13,12 +13,6 @@ export const meta = {
},
},
- res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'App',
- },
-
errors: {
noSuchApp: {
message: 'No such app.',
@@ -28,11 +22,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'App',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user, token) => {
diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts
index 6b2b0bc706..f028135ca5 100644
--- a/packages/backend/src/server/api/endpoints/auth/accept.ts
+++ b/packages/backend/src/server/api/endpoints/auth/accept.ts
@@ -9,7 +9,7 @@ import { secureRndstr } from '@/misc/secure-rndstr';
export const meta = {
tags: ['auth'],
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -26,7 +26,7 @@ export const meta = {
id: '9c72d8de-391a-43c1-9d06-08d29efde8df',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 b9e5e84f6e..98987eba5b 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
@@ -9,7 +9,7 @@ import { genId } from '@/misc/gen-id';
export const meta = {
tags: ['auth'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
appSecret: {
@@ -18,16 +18,16 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
token: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
url: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'url',
},
},
@@ -40,7 +40,7 @@ export const meta = {
id: '92f93e63-428e-4f2f-a5a4-39e1407fe998',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 3a32b5e548..ae0d016cea 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 { AuthSessions } from '@/models/index';
export const meta = {
tags: ['auth'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
token: {
@@ -23,26 +23,26 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
app: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'App',
},
token: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 131cdf3dfa..fe0211ebe3 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 { Apps, AuthSessions, AccessTokens, Users } from '@/models/index';
export const meta = {
tags: ['auth'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
appSecret: {
@@ -19,18 +19,18 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
accessToken: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
user: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailedNotMe',
},
},
},
@@ -54,7 +54,7 @@ export const meta = {
id: '8c8a4145-02cc-4cca-8e66-29ba60445a8e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts
index f718bcd205..6d555ff569 100644
--- a/packages/backend/src/server/api/endpoints/blocking/create.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/create.ts
@@ -15,7 +15,7 @@ export const meta = {
max: 100,
},
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:blocks',
@@ -46,11 +46,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailedNotMe',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts
index e563117410..942cddaedf 100644
--- a/packages/backend/src/server/api/endpoints/blocking/delete.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts
@@ -15,7 +15,7 @@ export const meta = {
max: 100,
},
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:blocks',
@@ -46,11 +46,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailedNotMe',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts
index f1f4b16999..9a4f662140 100644
--- a/packages/backend/src/server/api/endpoints/blocking/list.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/list.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:blocks',
@@ -27,15 +27,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Blocking',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts
index 9c88231ddd..48be728d99 100644
--- a/packages/backend/src/server/api/endpoints/channels/create.ts
+++ b/packages/backend/src/server/api/endpoints/channels/create.ts
@@ -9,7 +9,7 @@ import { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['channels'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:channels',
@@ -28,8 +28,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Channel',
},
@@ -40,7 +40,7 @@ export const meta = {
id: 'cd1e9f3e-5a12-4ab4-96f6-5d0a2cc32050',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts
index cec14cda11..ceadde907c 100644
--- a/packages/backend/src/server/api/endpoints/channels/featured.ts
+++ b/packages/backend/src/server/api/endpoints/channels/featured.ts
@@ -4,18 +4,18 @@ import { Channels } from '@/models/index';
export const meta = {
tags: ['channels'],
- requireCredential: false as const,
+ requireCredential: false,
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Channel',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts
index 3f4904f71d..bf580eea60 100644
--- a/packages/backend/src/server/api/endpoints/channels/follow.ts
+++ b/packages/backend/src/server/api/endpoints/channels/follow.ts
@@ -9,7 +9,7 @@ import { publishUserEvent } from '@/services/stream';
export const meta = {
tags: ['channels'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:channels',
@@ -26,7 +26,7 @@ export const meta = {
id: 'c0031718-d573-4e85-928e-10039f1fbb68',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts
index 82ae1a3afd..9e4c942af2 100644
--- a/packages/backend/src/server/api/endpoints/channels/followed.ts
+++ b/packages/backend/src/server/api/endpoints/channels/followed.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['channels', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:channels',
@@ -27,15 +27,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Channel',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/owned.ts b/packages/backend/src/server/api/endpoints/channels/owned.ts
index 128ea41158..5473636a85 100644
--- a/packages/backend/src/server/api/endpoints/channels/owned.ts
+++ b/packages/backend/src/server/api/endpoints/channels/owned.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['channels', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:channels',
@@ -27,15 +27,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Channel',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/show.ts b/packages/backend/src/server/api/endpoints/channels/show.ts
index 28cb927647..598a87ec4e 100644
--- a/packages/backend/src/server/api/endpoints/channels/show.ts
+++ b/packages/backend/src/server/api/endpoints/channels/show.ts
@@ -7,7 +7,7 @@ import { Channels } from '@/models/index';
export const meta = {
tags: ['channels'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
channelId: {
@@ -16,8 +16,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Channel',
},
@@ -28,7 +28,7 @@ export const meta = {
id: '6f6c314b-7486-4897-8966-c04a66a02923',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index ec60e5f236..927ce7c741 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -9,7 +9,7 @@ import { activeUsersChart } from '@/services/chart/index';
export const meta = {
tags: ['notes', 'channels'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
channelId: {
@@ -39,11 +39,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -55,7 +55,7 @@ export const meta = {
id: '4d0eeeba-a02c-4c3c-9966-ef60d38d2e7f',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts
index 1472aa0457..ada0cb29fd 100644
--- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts
+++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts
@@ -8,7 +8,7 @@ import { publishUserEvent } from '@/services/stream';
export const meta = {
tags: ['channels'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:channels',
@@ -25,7 +25,7 @@ export const meta = {
id: '19959ee9-0153-4c51-bbd9-a98c49dc59d6',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts
index fee79df2fa..1f7108a1cb 100644
--- a/packages/backend/src/server/api/endpoints/channels/update.ts
+++ b/packages/backend/src/server/api/endpoints/channels/update.ts
@@ -7,7 +7,7 @@ import { Channels, DriveFiles } from '@/models/index';
export const meta = {
tags: ['channels'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:channels',
@@ -30,8 +30,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Channel',
},
@@ -54,7 +54,7 @@ export const meta = {
id: 'e86c14a4-0da2-4032-8df3-e737a04c7f3b',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 ac77f8f1da..f7eadc7089 100644
--- a/packages/backend/src/server/api/endpoints/charts/active-users.ts
+++ b/packages/backend/src/server/api/endpoints/charts/active-users.ts
@@ -23,7 +23,7 @@ export const meta = {
},
res: convertLog(activeUsersChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/charts/drive.ts b/packages/backend/src/server/api/endpoints/charts/drive.ts
index 7f15467e7d..364279da95 100644
--- a/packages/backend/src/server/api/endpoints/charts/drive.ts
+++ b/packages/backend/src/server/api/endpoints/charts/drive.ts
@@ -23,7 +23,7 @@ export const meta = {
},
res: convertLog(driveChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/charts/federation.ts b/packages/backend/src/server/api/endpoints/charts/federation.ts
index 677c28c1e0..6feb82b6d9 100644
--- a/packages/backend/src/server/api/endpoints/charts/federation.ts
+++ b/packages/backend/src/server/api/endpoints/charts/federation.ts
@@ -23,7 +23,7 @@ export const meta = {
},
res: convertLog(federationChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/charts/hashtag.ts b/packages/backend/src/server/api/endpoints/charts/hashtag.ts
index aa41bcf90e..99dc77998e 100644
--- a/packages/backend/src/server/api/endpoints/charts/hashtag.ts
+++ b/packages/backend/src/server/api/endpoints/charts/hashtag.ts
@@ -27,7 +27,7 @@ export const meta = {
},
res: convertLog(hashtagChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/charts/instance.ts b/packages/backend/src/server/api/endpoints/charts/instance.ts
index 2ac415464d..23e6fbf2b0 100644
--- a/packages/backend/src/server/api/endpoints/charts/instance.ts
+++ b/packages/backend/src/server/api/endpoints/charts/instance.ts
@@ -27,7 +27,7 @@ export const meta = {
},
res: convertLog(instanceChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/charts/network.ts b/packages/backend/src/server/api/endpoints/charts/network.ts
index 4056becad2..c5a39bbd76 100644
--- a/packages/backend/src/server/api/endpoints/charts/network.ts
+++ b/packages/backend/src/server/api/endpoints/charts/network.ts
@@ -23,7 +23,7 @@ export const meta = {
},
res: convertLog(networkChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/charts/notes.ts b/packages/backend/src/server/api/endpoints/charts/notes.ts
index 00d6e0aa64..dcbd80c3e9 100644
--- a/packages/backend/src/server/api/endpoints/charts/notes.ts
+++ b/packages/backend/src/server/api/endpoints/charts/notes.ts
@@ -23,7 +23,7 @@ export const meta = {
},
res: convertLog(notesChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 462fb5879b..94787b4a57 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/drive.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/drive.ts
@@ -28,7 +28,7 @@ export const meta = {
},
res: convertLog(perUserDriveChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 3aee237d8f..effe0c54b9 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/following.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/following.ts
@@ -28,7 +28,7 @@ export const meta = {
},
res: convertLog(perUserFollowingChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 3536e7b779..df68a5fe52 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/notes.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/notes.ts
@@ -28,7 +28,7 @@ export const meta = {
},
res: convertLog(perUserNotesChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 9c5515f0b4..dcd067305f 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/reactions.ts
@@ -28,7 +28,7 @@ export const meta = {
},
res: convertLog(perUserReactionsChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/charts/users.ts b/packages/backend/src/server/api/endpoints/charts/users.ts
index d8bbb8300c..d32e14ad61 100644
--- a/packages/backend/src/server/api/endpoints/charts/users.ts
+++ b/packages/backend/src/server/api/endpoints/charts/users.ts
@@ -23,7 +23,7 @@ export const meta = {
},
res: convertLog(usersChart.schema),
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
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 992ba0edd3..4a740b6cfe 100644
--- a/packages/backend/src/server/api/endpoints/clips/add-note.ts
+++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts
@@ -9,7 +9,7 @@ import { getNote } from '../../common/getters';
export const meta = {
tags: ['account', 'notes', 'clips'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -42,7 +42,7 @@ export const meta = {
id: '734806c4-542c-463a-9311-15c512803965',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/clips/create.ts b/packages/backend/src/server/api/endpoints/clips/create.ts
index e9900247a1..852e66c9e4 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 { Clips } from '@/models/index';
export const meta = {
tags: ['clips'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -25,11 +25,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Clip',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/clips/delete.ts b/packages/backend/src/server/api/endpoints/clips/delete.ts
index b7d16322dd..85c64a115d 100644
--- a/packages/backend/src/server/api/endpoints/clips/delete.ts
+++ b/packages/backend/src/server/api/endpoints/clips/delete.ts
@@ -7,7 +7,7 @@ import { Clips } from '@/models/index';
export const meta = {
tags: ['clips'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -24,7 +24,7 @@ export const meta = {
id: '70ca08ba-6865-4630-b6fb-8494759aa754',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/clips/list.ts b/packages/backend/src/server/api/endpoints/clips/list.ts
index 8388438bd1..d88897d164 100644
--- a/packages/backend/src/server/api/endpoints/clips/list.ts
+++ b/packages/backend/src/server/api/endpoints/clips/list.ts
@@ -4,20 +4,20 @@ import { Clips } from '@/models/index';
export const meta = {
tags: ['clips', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Clip',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts
index c8871cd3fa..eeb20631c1 100644
--- a/packages/backend/src/server/api/endpoints/clips/notes.ts
+++ b/packages/backend/src/server/api/endpoints/clips/notes.ts
@@ -11,7 +11,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['account', 'notes', 'clips'],
- requireCredential: false as const,
+ requireCredential: false,
kind: 'read:account',
@@ -43,15 +43,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/clips/show.ts b/packages/backend/src/server/api/endpoints/clips/show.ts
index ce65abd65d..0a45672019 100644
--- a/packages/backend/src/server/api/endpoints/clips/show.ts
+++ b/packages/backend/src/server/api/endpoints/clips/show.ts
@@ -7,7 +7,7 @@ import { Clips } from '@/models/index';
export const meta = {
tags: ['clips', 'account'],
- requireCredential: false as const,
+ requireCredential: false,
kind: 'read:account',
@@ -26,11 +26,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Clip',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/clips/update.ts b/packages/backend/src/server/api/endpoints/clips/update.ts
index 44e8fe33e8..795483d5b2 100644
--- a/packages/backend/src/server/api/endpoints/clips/update.ts
+++ b/packages/backend/src/server/api/endpoints/clips/update.ts
@@ -7,7 +7,7 @@ import { Clips } from '@/models/index';
export const meta = {
tags: ['clips'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -38,11 +38,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Clip',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/drive.ts b/packages/backend/src/server/api/endpoints/drive.ts
index 35ac98bdf2..d9ab9883ca 100644
--- a/packages/backend/src/server/api/endpoints/drive.ts
+++ b/packages/backend/src/server/api/endpoints/drive.ts
@@ -5,25 +5,25 @@ import { DriveFiles } from '@/models/index';
export const meta = {
tags: ['drive', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
capacity: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
usage: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts
index 7a577bce64..a5c0a626a1 100644
--- a/packages/backend/src/server/api/endpoints/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -36,15 +36,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 a02ac3eef0..835dde8058 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
@@ -7,7 +7,7 @@ import { DriveFiles, Notes } from '@/models/index';
export const meta = {
tags: ['drive', 'notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -18,11 +18,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -34,7 +34,7 @@ export const meta = {
id: 'c118ece3-2e4b-4296-99d1-51756e32d232',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 14517ab4b5..a45d357ee8 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
@@ -5,7 +5,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -16,10 +16,10 @@ export const meta = {
},
res: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 640b62c6ec..f598f18ed5 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/create.ts
@@ -10,7 +10,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
@@ -46,8 +46,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
@@ -58,7 +58,7 @@ export const meta = {
id: 'f449b209-0c60-4e51-84d5-29486263bfd4',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user, _, file, cleanup) => {
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 2e32e6879b..308beb58a4 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts
@@ -9,7 +9,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:drive',
@@ -32,7 +32,7 @@ export const meta = {
id: '5eb8d909-2540-4970-90b8-dd6f86088121',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 5617769a9e..dc74dcb7e6 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
@@ -5,7 +5,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -16,15 +16,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 415ab79612..2244df13cd 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/find.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/find.ts
@@ -4,7 +4,7 @@ import define from '../../../define';
import { DriveFiles } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
tags: ['drive'],
@@ -22,15 +22,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 4a8830e9cb..18b17c4653 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 { DriveFiles } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -23,8 +23,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
@@ -47,7 +47,7 @@ export const meta = {
id: '89674805-722c-440c-8d88-5641830dc3e4',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 329e959c53..b7ca80e83c 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts
@@ -9,7 +9,7 @@ import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:drive',
@@ -60,11 +60,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 7e3ffd881f..6ab1ca137d 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
@@ -15,7 +15,7 @@ export const meta = {
max: 60,
},
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:drive',
@@ -50,7 +50,7 @@ export const meta = {
default: false,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts
index 85938e7b54..8f8d1d2c0a 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -32,15 +32,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFolder',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 401b591525..38ed17e0e5 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
@@ -9,7 +9,7 @@ import { genId } from '@/misc/gen-id';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:drive',
@@ -37,7 +37,7 @@ export const meta = {
optional: false as const, nullable: false as const,
ref: 'DriveFolder',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 2360a3abf8..13716fccea 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
@@ -8,7 +8,7 @@ import { DriveFolders, DriveFiles } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:drive',
@@ -31,7 +31,7 @@ export const meta = {
id: 'b0fc8a17-963c-405d-bfbc-859a487295e1',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 47e45a23fc..911f51d78b 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts
@@ -6,7 +6,7 @@ import { DriveFolders } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -22,15 +22,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFolder',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 d6eac59fe0..58a6dd3c06 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/show.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/show.ts
@@ -7,7 +7,7 @@ import { DriveFolders } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -18,8 +18,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFolder',
},
@@ -30,7 +30,7 @@ export const meta = {
id: 'd74ab9eb-bb09-4bba-bf24-fb58f761e1e9',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 5ae5424fb2..5b0cccd1c6 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
@@ -8,7 +8,7 @@ import { DriveFolders } from '@/models/index';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:drive',
@@ -47,11 +47,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFolder',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/drive/stream.ts b/packages/backend/src/server/api/endpoints/drive/stream.ts
index 675e3225f5..9ba7804946 100644
--- a/packages/backend/src/server/api/endpoints/drive/stream.ts
+++ b/packages/backend/src/server/api/endpoints/drive/stream.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['drive'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:drive',
@@ -31,15 +31,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'DriveFile',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 5e8f1706f3..19f9b7ccdc 100644
--- a/packages/backend/src/server/api/endpoints/email-address/available.ts
+++ b/packages/backend/src/server/api/endpoints/email-address/available.ts
@@ -5,7 +5,7 @@ import { validateEmailForAccount } from '@/services/validate-email-for-account';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
emailAddress: {
@@ -14,20 +14,20 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
available: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
reason: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/endpoint.ts b/packages/backend/src/server/api/endpoints/endpoint.ts
index 597911da82..42fd468838 100644
--- a/packages/backend/src/server/api/endpoints/endpoint.ts
+++ b/packages/backend/src/server/api/endpoints/endpoint.ts
@@ -3,7 +3,7 @@ import define from '../define';
import endpoints from '../endpoints';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
tags: ['meta'],
@@ -12,7 +12,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/endpoints.ts b/packages/backend/src/server/api/endpoints/endpoints.ts
index 4e304dbeb1..ebb78de337 100644
--- a/packages/backend/src/server/api/endpoints/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints/endpoints.ts
@@ -2,7 +2,7 @@ import define from '../define';
import endpoints from '../endpoints';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
tags: ['meta'],
@@ -10,11 +10,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
example: [
'admin/abuse-user-reports',
@@ -23,7 +23,7 @@ export const meta = {
'...',
],
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
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 8b7e8a0493..24c9f56aa6 100644
--- a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
+++ b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
@@ -5,12 +5,12 @@ import ms from 'ms';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
max: 1,
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts
index a44b0aecf6..c0a85f166c 100644
--- a/packages/backend/src/server/api/endpoints/federation/followers.ts
+++ b/packages/backend/src/server/api/endpoints/federation/followers.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['federation'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
host: {
@@ -29,15 +29,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Following',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts
index c10e25864e..147f0aedb2 100644
--- a/packages/backend/src/server/api/endpoints/federation/following.ts
+++ b/packages/backend/src/server/api/endpoints/federation/following.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['federation'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
host: {
@@ -29,15 +29,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Following',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index e73d0e5ada..11df7ed6b6 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -7,7 +7,7 @@ import { fetchMeta } from '@/misc/fetch-meta';
export const meta = {
tags: ['federation'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
host: {
@@ -54,15 +54,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'FederationInstance',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 15b4f31518..6f13b28cae 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 { toPuny } from '@/misc/convert-host';
export const meta = {
tags: ['federation'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
host: {
@@ -15,11 +15,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: true, nullable: false,
ref: 'FederationInstance',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 371859345f..092f805bc2 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
@@ -7,14 +7,14 @@ import { updatePerson } from '@/remote/activitypub/models/person';
export const meta = {
tags: ['federation'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
userId: {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts
index 8372169d67..9a8f749936 100644
--- a/packages/backend/src/server/api/endpoints/federation/users.ts
+++ b/packages/backend/src/server/api/endpoints/federation/users.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['federation'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
host: {
@@ -29,15 +29,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailedNotMe',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts
index 951cf8fa20..96aede4550 100644
--- a/packages/backend/src/server/api/endpoints/following/create.ts
+++ b/packages/backend/src/server/api/endpoints/following/create.ts
@@ -15,7 +15,7 @@ export const meta = {
max: 100,
},
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:following',
@@ -58,11 +58,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserLite',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts
index de43fa4387..4cd0c49452 100644
--- a/packages/backend/src/server/api/endpoints/following/delete.ts
+++ b/packages/backend/src/server/api/endpoints/following/delete.ts
@@ -15,7 +15,7 @@ export const meta = {
max: 100,
},
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:following',
@@ -46,11 +46,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserLite',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts
index 388ddda797..92e887e00b 100644
--- a/packages/backend/src/server/api/endpoints/following/invalidate.ts
+++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts
@@ -15,7 +15,7 @@ export const meta = {
max: 100,
},
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:following',
@@ -46,11 +46,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserLite',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 29f0ace2ab..7e7c056f55 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/accept.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/accept.ts
@@ -8,7 +8,7 @@ import { getUser } from '../../../common/getters';
export const meta = {
tags: ['following', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:following',
@@ -30,7 +30,7 @@ export const meta = {
id: 'bcde4f8b-0913-4614-8881-614e522fb041',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 d5281c468b..19ed02c152 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/cancel.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/cancel.ts
@@ -9,7 +9,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['following', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:following',
@@ -34,11 +34,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserLite',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 bfd793faf9..ec0c76502c 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/list.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/list.ts
@@ -4,36 +4,36 @@ import { FollowRequests } from '@/models/index';
export const meta = {
tags: ['following', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:following',
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
follower: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserLite',
},
followee: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserLite',
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 77a14af1f7..a5ce1e7c77 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/reject.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/reject.ts
@@ -8,7 +8,7 @@ import { getUser } from '../../../common/getters';
export const meta = {
tags: ['following', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:following',
@@ -25,7 +25,7 @@ export const meta = {
id: 'abc2ffa6-25b2-4380-ba99-321ff3a94555',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts
index a6ca956924..ff7c16889f 100644
--- a/packages/backend/src/server/api/endpoints/gallery/featured.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts
@@ -4,18 +4,18 @@ import { GalleryPosts } from '@/models/index';
export const meta = {
tags: ['gallery'],
- requireCredential: false as const,
+ requireCredential: false,
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts
index efd1f76052..2c3368a19d 100644
--- a/packages/backend/src/server/api/endpoints/gallery/popular.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts
@@ -4,18 +4,18 @@ import { GalleryPosts } from '@/models/index';
export const meta = {
tags: ['gallery'],
- requireCredential: false as const,
+ requireCredential: false,
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts
index 1b1368b06f..9d2601c7e9 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts
@@ -23,15 +23,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 1a75ba2cb2..e9d5df1ab6 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
@@ -11,7 +11,7 @@ import { DriveFile } from '@/models/entities/drive-file';
export const meta = {
tags: ['gallery'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:gallery',
@@ -40,15 +40,15 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
errors: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 dbf7b2f9c0..2a13b9ed58 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
@@ -7,7 +7,7 @@ import { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['gallery'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:gallery',
@@ -24,7 +24,7 @@ export const meta = {
id: 'ae52f367-4bd7-4ecd-afc6-5672fff427f5',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 2f98f41fa4..0fb408fa5f 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
@@ -8,7 +8,7 @@ import { genId } from '@/misc/gen-id';
export const meta = {
tags: ['gallery'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:gallery-likes',
@@ -37,7 +37,7 @@ export const meta = {
id: '40e9ed56-a59c-473a-bf3f-f289c54fb5a7',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 7044f948fb..4325d2ad37 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
@@ -7,7 +7,7 @@ import { GalleryPosts } from '@/models/index';
export const meta = {
tags: ['gallery'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
postId: {
@@ -24,11 +24,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 8cf4f34251..9cca09bddc 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
@@ -7,7 +7,7 @@ import { GalleryPosts, GalleryLikes } from '@/models/index';
export const meta = {
tags: ['gallery'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:gallery-likes',
@@ -30,7 +30,7 @@ export const meta = {
id: 'e3e8e06e-be37-41f7-a5b4-87a8250288f0',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 67028125d4..c35e1bbf58 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
@@ -10,7 +10,7 @@ import { DriveFile } from '@/models/entities/drive-file';
export const meta = {
tags: ['gallery'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:gallery',
@@ -43,15 +43,15 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
errors: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 b429eacef3..5b13d5a3b8 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
@@ -6,11 +6,11 @@ import define from '../define';
export const meta = {
tags: ['meta'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts
index 3900fdcc4a..9fa9b3edc6 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/list.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts
@@ -5,7 +5,7 @@ import { Hashtags } from '@/models/index';
export const meta = {
tags: ['hashtags'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
limit: {
@@ -47,15 +47,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Hashtag',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts
index 8642bb39ff..0d646c64f5 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/search.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts
@@ -5,7 +5,7 @@ import { Hashtags } from '@/models/index';
export const meta = {
tags: ['hashtags'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
limit: {
@@ -24,14 +24,14 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts
index 454b98e5a4..242cef99d4 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/show.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts
@@ -7,7 +7,7 @@ import { normalizeForSearch } from '@/misc/normalize-for-search';
export const meta = {
tags: ['hashtags'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
tag: {
@@ -16,8 +16,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Hashtag',
},
@@ -28,7 +28,7 @@ export const meta = {
id: '110ee688-193e-4a3a-9ecf-c167b2e6981e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
index e02666a888..be964ad639 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
@@ -23,35 +23,35 @@ const max = 5;
export const meta = {
tags: ['hashtags'],
- requireCredential: false as const,
+ requireCredential: false,
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
tag: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
chart: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
usersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index 6bbe87a0d5..2158dc4349 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -4,7 +4,7 @@ import { Users } from '@/models/index';
import { normalizeForSearch } from '@/misc/normalize-for-search';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
tags: ['hashtags', 'users'],
@@ -48,15 +48,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts
index e5a2c9d2f7..d69c118cfc 100644
--- a/packages/backend/src/server/api/endpoints/i.ts
+++ b/packages/backend/src/server/api/endpoints/i.ts
@@ -4,23 +4,23 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
params: {},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'MeDetailed',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user, token) => {
const isSecure = token == null;
// ã“ã“ã§æ¸¡ã£ã¦ãã¦ã„ã‚‹ user ã¯ã‚ャッシュã•ã‚Œã¦ã„ã¦å¤ã„å¯èƒ½æ€§ã‚‚ã‚ã‚‹ã®ã§ id ã ã‘渡ã™
- return await Users.pack(user.id, user, {
+ return await Users.pack<true, true>(user.id, user, {
detail: true,
includeSecrets: isSecure,
});
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 f6c5ac33aa..4853908693 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts
@@ -4,7 +4,7 @@ import define from '../../../define';
import { UserProfiles } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -13,7 +13,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 cd1f16e548..271632d362 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
@@ -16,7 +16,7 @@ import { publishMainStream } from '@/services/stream';
const cborDecodeFirst = promisify(cbor.decodeFirst) as any;
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -37,7 +37,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
const rpIdHashReal = hash(Buffer.from(config.hostname, 'utf-8'));
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 9eecbb3dc8..854848a434 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
@@ -3,7 +3,7 @@ import define from '../../../define';
import { UserProfiles } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -12,7 +12,7 @@ export const meta = {
validator: $.boolean,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 19294d15a6..b6b0fd50b4 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
@@ -10,7 +10,7 @@ import { hash } from '../../../2fa';
const randomBytes = promisify(crypto.randomBytes);
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -19,7 +19,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 0fe824a6ef..c5cfb9dfad 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts
@@ -7,7 +7,7 @@ import define from '../../../define';
import { UserProfiles } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -16,7 +16,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 b9a6354238..03e1d0434d 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
@@ -5,7 +5,7 @@ import { UserProfiles, UserSecurityKeys, Users } from '@/models/index';
import { publishMainStream } from '@/services/stream';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -17,7 +17,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 0e7014d3f5..a19ad6810d 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
@@ -4,7 +4,7 @@ import define from '../../../define';
import { UserProfiles } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -13,7 +13,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/apps.ts b/packages/backend/src/server/api/endpoints/i/apps.ts
index 6c71a071f2..63999b0981 100644
--- a/packages/backend/src/server/api/endpoints/i/apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/apps.ts
@@ -3,7 +3,7 @@ import define from '../../define';
import { AccessTokens } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -17,7 +17,7 @@ export const meta = {
]),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 127a272c44..52122b851b 100644
--- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
@@ -3,7 +3,7 @@ import define from '../../define';
import { AccessTokens, Apps } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -23,7 +23,7 @@ export const meta = {
default: 'desc',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 5ba7a2a87e..7b6c137737 100644
--- a/packages/backend/src/server/api/endpoints/i/change-password.ts
+++ b/packages/backend/src/server/api/endpoints/i/change-password.ts
@@ -4,7 +4,7 @@ import define from '../../define';
import { UserProfiles } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -17,7 +17,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 bfbf2e5e5c..e1eee949fc 100644
--- a/packages/backend/src/server/api/endpoints/i/delete-account.ts
+++ b/packages/backend/src/server/api/endpoints/i/delete-account.ts
@@ -7,7 +7,7 @@ import { publishUserEvent } from '@/services/stream';
import { createDeleteAccountJob } from '@/queue';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -16,7 +16,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 4f2143475f..44d8a1cb38 100644
--- a/packages/backend/src/server/api/endpoints/i/export-blocking.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-blocking.ts
@@ -4,12 +4,12 @@ import ms from 'ms';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
max: 1,
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 4b2f4c86a9..5d1617d57b 100644
--- a/packages/backend/src/server/api/endpoints/i/export-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-following.ts
@@ -5,7 +5,7 @@ import ms from 'ms';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
max: 1,
@@ -20,7 +20,7 @@ export const meta = {
default: false,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 1f655c5118..27ce8f0b29 100644
--- a/packages/backend/src/server/api/endpoints/i/export-mute.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-mute.ts
@@ -4,12 +4,12 @@ import ms from 'ms';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
max: 1,
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 aa3d7955fa..25b1849e80 100644
--- a/packages/backend/src/server/api/endpoints/i/export-notes.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-notes.ts
@@ -4,12 +4,12 @@ import ms from 'ms';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1day'),
max: 1,
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 e135ba1031..d28b699c5a 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
@@ -4,12 +4,12 @@ import ms from 'ms';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1min'),
max: 1,
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts
index 2ae5aa87a7..92c767876b 100644
--- a/packages/backend/src/server/api/endpoints/i/favorites.ts
+++ b/packages/backend/src/server/api/endpoints/i/favorites.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['account', 'notes', 'favorites'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:favorites',
@@ -27,15 +27,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'NoteFavorite',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 ebcb459c68..f1c5763593 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../../common/make-pagination-query';
export const meta = {
tags: ['account', 'gallery'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:gallery-likes',
@@ -27,22 +27,22 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
page: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 bb77484dab..d46d42f633 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../../common/make-pagination-query';
export const meta = {
tags: ['account', 'gallery'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:gallery',
@@ -27,15 +27,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'GalleryPost',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts
index 93c8321166..4e1a4d3db9 100644
--- a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts
+++ b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts
@@ -4,7 +4,7 @@ import { MutedNotes } from '@/models/index';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
@@ -12,16 +12,16 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
count: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 6b5100c21e..acc5797420 100644
--- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-blocking.ts
@@ -8,7 +8,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
@@ -46,7 +46,7 @@ export const meta = {
id: '6f3a4dcc-f060-a707-4950-806fbdbe60d6',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 a0ab45b0a4..35006746fb 100644
--- a/packages/backend/src/server/api/endpoints/i/import-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-following.ts
@@ -8,7 +8,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
max: 1,
@@ -45,7 +45,7 @@ export const meta = {
id: '31a1b42c-06f7-42ae-8a38-a661c5c9f691',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 b5878f4f5d..7bbb2e008e 100644
--- a/packages/backend/src/server/api/endpoints/i/import-muting.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-muting.ts
@@ -8,7 +8,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
@@ -46,7 +46,7 @@ export const meta = {
id: 'd2f12af1-e7b4-feac-86a3-519548f2728e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 563ecf38e6..759d41b6cd 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
@@ -8,7 +8,7 @@ import { DriveFiles } from '@/models/index';
export const meta = {
secure: true,
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
max: 1,
@@ -45,7 +45,7 @@ export const meta = {
id: '99efe367-ce6e-4d44-93f8-5fae7b040356',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts
index f02e94f328..59efd32bb2 100644
--- a/packages/backend/src/server/api/endpoints/i/notifications.ts
+++ b/packages/backend/src/server/api/endpoints/i/notifications.ts
@@ -12,7 +12,7 @@ import { Brackets } from 'typeorm';
export const meta = {
tags: ['account', 'notifications'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:notifications',
@@ -55,15 +55,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Notification',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 7b8f4864fa..59239c7446 100644
--- a/packages/backend/src/server/api/endpoints/i/page-likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['account', 'pages'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:page-likes',
@@ -27,22 +27,22 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
page: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Page',
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts
index 78de9e2bfb..bef775d063 100644
--- a/packages/backend/src/server/api/endpoints/i/pages.ts
+++ b/packages/backend/src/server/api/endpoints/i/pages.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['account', 'pages'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:pages',
@@ -27,15 +27,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Page',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/pin.ts b/packages/backend/src/server/api/endpoints/i/pin.ts
index 9fc73908ae..a940d1b99b 100644
--- a/packages/backend/src/server/api/endpoints/i/pin.ts
+++ b/packages/backend/src/server/api/endpoints/i/pin.ts
@@ -8,7 +8,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['account', 'notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -39,11 +39,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'MeDetailed',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
@@ -54,7 +54,7 @@ export default define(meta, async (ps, user) => {
throw e;
});
- return await Users.pack(user.id, user, {
+ return await Users.pack<true, true>(user.id, user, {
detail: true,
});
});
diff --git a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
index 26c1abced4..4e4fb3840f 100644
--- a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
@@ -5,13 +5,13 @@ import { MessagingMessages, UserGroupJoinings } from '@/models/index';
export const meta = {
tags: ['account', 'messaging'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
params: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 44c32a9ee1..99f17ddfc9 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
@@ -5,13 +5,13 @@ import { NoteUnreads } from '@/models/index';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
params: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 5814c5c3c1..e9bb66264b 100644
--- a/packages/backend/src/server/api/endpoints/i/read-announcement.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-announcement.ts
@@ -9,7 +9,7 @@ import { publishMainStream } from '@/services/stream';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -26,7 +26,7 @@ export const meta = {
id: '184663db-df88-4bc2-8b52-fb85f0681939',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 13dbd7bd5f..a20719363b 100644
--- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
+++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
@@ -6,7 +6,7 @@ import define from '../../define';
import { Users, UserProfiles } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -15,7 +15,7 @@ export const meta = {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 0f36d3f507..2941b441e2 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
@@ -3,7 +3,7 @@ import define from '../../../define';
import { RegistryItems } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -13,7 +13,7 @@ export const meta = {
default: [],
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 36d8452074..51371353c9 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
@@ -4,7 +4,7 @@ import { RegistryItems } from '@/models/index';
import { ApiError } from '../../../error';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -26,7 +26,7 @@ export const meta = {
id: '97a1e8e7-c0f7-47d2-957a-92e61256e01a',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 e1b80035b6..ac617defb0 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts
@@ -4,7 +4,7 @@ import { RegistryItems } from '@/models/index';
import { ApiError } from '../../../error';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -26,7 +26,7 @@ export const meta = {
id: 'ac3ed68a-62f0-422b-a7bc-d5e09e8f6a6a',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 53ff7b1369..0445922188 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
@@ -3,7 +3,7 @@ import define from '../../../define';
import { RegistryItems } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -13,7 +13,7 @@ export const meta = {
default: [],
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 40ae094d55..a3c9d0e5ee 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/keys.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/keys.ts
@@ -3,7 +3,7 @@ import define from '../../../define';
import { RegistryItems } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -13,7 +13,7 @@ export const meta = {
default: [],
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 bea9be73e4..08185f224b 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/remove.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/remove.ts
@@ -4,7 +4,7 @@ import { RegistryItems } from '@/models/index';
import { ApiError } from '../../../error';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -26,7 +26,7 @@ export const meta = {
id: '1fac4e8a-a6cd-4e39-a4a5-3a7e11f1b019',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
index c7596f48f1..9de68ac6e8 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
@@ -2,13 +2,13 @@ import define from '../../../define';
import { RegistryItems } from '@/models/index';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
params: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 c373b1a215..27884046b4 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/set.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/set.ts
@@ -5,7 +5,7 @@ import { RegistryItems } from '@/models/index';
import { genId } from '@/misc/gen-id';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -23,7 +23,7 @@ export const meta = {
default: [],
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 acef3a58ed..51721c5b58 100644
--- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts
+++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts
@@ -5,7 +5,7 @@ import { ID } from '@/misc/cafy-id';
import { publishUserEvent } from '@/services/stream';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -14,7 +14,7 @@ export const meta = {
validator: $.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 deb1315477..796e2ec309 100644
--- a/packages/backend/src/server/api/endpoints/i/signin-history.ts
+++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts
@@ -5,7 +5,7 @@ import { Signins } from '@/models/index';
import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -23,7 +23,7 @@ export const meta = {
validator: $.optional.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/unpin.ts b/packages/backend/src/server/api/endpoints/i/unpin.ts
index 8182254ac1..9c82b74960 100644
--- a/packages/backend/src/server/api/endpoints/i/unpin.ts
+++ b/packages/backend/src/server/api/endpoints/i/unpin.ts
@@ -8,7 +8,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['account', 'notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -27,11 +27,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'MeDetailed',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
@@ -40,7 +40,7 @@ export default define(meta, async (ps, user) => {
throw e;
});
- return await Users.pack(user.id, user, {
+ return await Users.pack<true, true>(user.id, user, {
detail: true,
});
});
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 19bf802482..b4479aa50d 100644
--- a/packages/backend/src/server/api/endpoints/i/update-email.ts
+++ b/packages/backend/src/server/api/endpoints/i/update-email.ts
@@ -11,7 +11,7 @@ import { ApiError } from '../../error';
import { validateEmailForAccount } from '@/services/validate-email-for-account';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -43,7 +43,7 @@ export const meta = {
id: 'a2defefb-f220-8849-0af6-17f816099323',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 3c6050efde..6b7e53aa1f 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -19,7 +19,7 @@ import { normalizeForSearch } from '@/misc/normalize-for-search';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -162,11 +162,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'MeDetailed',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, _user, token) => {
@@ -279,7 +279,7 @@ export default define(meta, async (ps, _user, token) => {
if (Object.keys(updates).length > 0) await Users.update(user.id, updates);
if (Object.keys(profileUpdates).length > 0) await UserProfiles.update(user.id, profileUpdates);
- const iObj = await Users.pack(user.id, user, {
+ const iObj = await Users.pack<true, true>(user.id, user, {
detail: true,
includeSecrets: isSecure,
});
diff --git a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
index cbe3f64a20..76a3131e6d 100644
--- a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
+++ b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
@@ -7,7 +7,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['account', 'groups'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:user-groups',
@@ -27,26 +27,26 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
group: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserGroup',
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts
index ca5b1d06a3..5ac49cf96b 100644
--- a/packages/backend/src/server/api/endpoints/messaging/history.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/history.ts
@@ -7,7 +7,7 @@ import { Brackets } from 'typeorm';
export const meta = {
tags: ['messaging'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:messaging',
@@ -24,15 +24,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'MessagingMessage',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
index 9332695fdc..7dbddd80e2 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts
@@ -11,7 +11,7 @@ import { readUserMessagingMessage, readGroupMessagingMessage, deliverReadActivit
export const meta = {
tags: ['messaging'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:messaging',
@@ -44,11 +44,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'MessagingMessage',
},
},
@@ -72,7 +72,7 @@ export const meta = {
id: 'a053a8dd-a491-4718-8f87-50775aad9284',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
index 6092746676..5ec16f5e5a 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
@@ -11,7 +11,7 @@ import { createMessage } from '@/services/messages/create';
export const meta = {
tags: ['messaging'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:messaging',
@@ -34,8 +34,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'MessagingMessage',
},
@@ -82,7 +82,7 @@ export const meta = {
id: 'c15a5199-7422-4968-941a-2a462c478f7d',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
index 7362f705ef..2975419cef 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
@@ -9,7 +9,7 @@ import { deleteMessage } from '@/services/messages/delete';
export const meta = {
tags: ['messaging'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:messaging',
@@ -32,7 +32,7 @@ export const meta = {
id: '54b5b326-7925-42cf-8019-130fda8b56af',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
index c698f39792..42c3f49f6f 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
@@ -8,7 +8,7 @@ import { readUserMessagingMessage, readGroupMessagingMessage } from '../../../co
export const meta = {
tags: ['messaging'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:messaging',
@@ -25,7 +25,7 @@ export const meta = {
id: '86d56a2f-a9c3-4afb-b13c-3e9bfef9aa14',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 6b07011fd8..693a7a04ec 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -9,7 +9,7 @@ import { MoreThan } from 'typeorm';
export const meta = {
tags: ['meta'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
detail: {
@@ -19,434 +19,434 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
maintainerName: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
maintainerEmail: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
version: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
example: config.version,
},
name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
uri: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'url',
example: 'https://misskey.example.com',
},
description: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
langs: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
tosUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
repositoryUrl: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
default: 'https://github.com/misskey-dev/misskey',
},
feedbackUrl: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
default: 'https://github.com/misskey-dev/misskey/issues/new',
},
secure: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
default: false,
},
disableRegistration: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
disableLocalTimeline: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
disableGlobalTimeline: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
driveCapacityPerLocalUserMb: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
driveCapacityPerRemoteUserMb: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
cacheRemoteFiles: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
proxyRemoteFiles: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
emailRequiredForSignup: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
enableHcaptcha: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
hcaptchaSiteKey: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
enableRecaptcha: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
recaptchaSiteKey: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
swPublickey: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
mascotImageUrl: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
default: '/assets/ai.png',
},
bannerUrl: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
errorImageUrl: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
default: 'https://xn--931a.moe/aiart/yubitun.png',
},
iconUrl: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
maxNoteTextLength: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
default: 500,
},
emojis: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
aliases: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
category: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
host: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
url: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'url',
},
},
},
},
ads: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
place: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
url: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'url',
},
imageUrl: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'url',
},
},
},
},
requireSetup: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
example: false,
},
enableEmail: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
enableTwitterIntegration: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
enableGithubIntegration: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
enableDiscordIntegration: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
enableServiceWorker: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
translatorAvailable: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
proxyAccountName: {
- type: 'string' as const,
- optional: false as const, nullable: true as const,
+ type: 'string',
+ optional: false, nullable: true,
},
features: {
- type: 'object' as const,
- optional: true as const, nullable: false as const,
+ type: 'object',
+ optional: true, nullable: false,
properties: {
registration: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
localTimeLine: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
globalTimeLine: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
elasticsearch: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
hcaptcha: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
recaptcha: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
objectStorage: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
twitter: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
github: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
discord: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
serviceWorker: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
miauth: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
default: true,
},
},
},
userStarForReactionFallback: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
},
pinnedUsers: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
+ type: 'array',
+ optional: true, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
hiddenTags: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
+ type: 'array',
+ optional: true, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
blockedHosts: {
- type: 'array' as const,
- optional: true as const, nullable: false as const,
+ type: 'array',
+ optional: true, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
hcaptchaSecretKey: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
recaptchaSecretKey: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
proxyAccountId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
format: 'id',
},
twitterConsumerKey: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
twitterConsumerSecret: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
githubClientId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
githubClientSecret: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
discordClientId: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
discordClientSecret: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
summaryProxy: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
email: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
smtpSecure: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
},
smtpHost: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
smtpPort: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
smtpUser: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
smtpPass: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
swPrivateKey: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
useObjectStorage: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
},
objectStorageBaseUrl: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
objectStorageBucket: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
objectStoragePrefix: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
objectStorageEndpoint: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
objectStorageRegion: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
objectStoragePort: {
- type: 'number' as const,
- optional: true as const, nullable: true as const,
+ type: 'number',
+ optional: true, nullable: true,
},
objectStorageAccessKey: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
objectStorageSecretKey: {
- type: 'string' as const,
- optional: true as const, nullable: true as const,
+ type: 'string',
+ optional: true, nullable: true,
},
objectStorageUseSSL: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
},
objectStorageUseProxy: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
},
objectStorageSetPublicRead: {
- type: 'boolean' as const,
- optional: true as const, nullable: false as const,
+ type: 'boolean',
+ optional: true, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 cc739a51e3..158c8877e9 100644
--- a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts
+++ b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts
@@ -7,7 +7,7 @@ import { secureRndstr } from '@/misc/secure-rndstr';
export const meta = {
tags: ['auth'],
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
@@ -34,16 +34,16 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
token: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts
index 000e48ddea..6ba5a453c3 100644
--- a/packages/backend/src/server/api/endpoints/mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/mute/create.ts
@@ -11,7 +11,7 @@ import { publishUserEvent } from '@/services/stream';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:mutes',
@@ -40,7 +40,7 @@ export const meta = {
id: '7e7359cb-160c-4956-b08f-4d1c653cd007',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/mute/delete.ts b/packages/backend/src/server/api/endpoints/mute/delete.ts
index c204add1bd..21948dc3d1 100644
--- a/packages/backend/src/server/api/endpoints/mute/delete.ts
+++ b/packages/backend/src/server/api/endpoints/mute/delete.ts
@@ -9,7 +9,7 @@ import { publishUserEvent } from '@/services/stream';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:mutes',
@@ -38,7 +38,7 @@ export const meta = {
id: '5467d020-daa9-4553-81e1-135c0c35a96d',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts
index a736161b9c..4c6a81b63c 100644
--- a/packages/backend/src/server/api/endpoints/mute/list.ts
+++ b/packages/backend/src/server/api/endpoints/mute/list.ts
@@ -7,7 +7,7 @@ import { Mutings } from '@/models/index';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:mutes',
@@ -27,15 +27,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Muting',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/my/apps.ts b/packages/backend/src/server/api/endpoints/my/apps.ts
index d9443d38d9..42bd5c5f75 100644
--- a/packages/backend/src/server/api/endpoints/my/apps.ts
+++ b/packages/backend/src/server/api/endpoints/my/apps.ts
@@ -5,7 +5,7 @@ import { Apps } from '@/models/index';
export const meta = {
tags: ['account', 'app'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
limit: {
@@ -20,54 +20,54 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
name: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
callbackUrl: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
permission: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
secret: {
- type: 'string' as const,
- optional: true as const, nullable: false as const,
+ type: 'string',
+ optional: true, nullable: false,
},
isAuthorized: {
- type: 'object' as const,
- optional: true as const, nullable: false as const,
+ type: 'object',
+ optional: true, nullable: false,
properties: {
appId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
userId: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
},
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts
index c853996a48..9edc6cb11c 100644
--- a/packages/backend/src/server/api/endpoints/notes.ts
+++ b/packages/backend/src/server/api/endpoints/notes.ts
@@ -43,15 +43,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts
index d6062f4ebb..088ef65e96 100644
--- a/packages/backend/src/server/api/endpoints/notes/children.ts
+++ b/packages/backend/src/server/api/endpoints/notes/children.ts
@@ -12,7 +12,7 @@ import { generateMutedInstanceQuery } from '../../common/generate-muted-instance
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -34,15 +34,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/clips.ts b/packages/backend/src/server/api/endpoints/notes/clips.ts
index 67bac3670b..b89c6db4a8 100644
--- a/packages/backend/src/server/api/endpoints/notes/clips.ts
+++ b/packages/backend/src/server/api/endpoints/notes/clips.ts
@@ -9,7 +9,7 @@ import { In } from 'typeorm';
export const meta = {
tags: ['clips', 'notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -18,12 +18,12 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'Note',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Clip',
},
},
@@ -34,7 +34,7 @@ export const meta = {
id: '47db1a1c-b0af-458d-8fb4-986e4efafe1e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/conversation.ts b/packages/backend/src/server/api/endpoints/notes/conversation.ts
index a465b08d3a..4bd89c32e7 100644
--- a/packages/backend/src/server/api/endpoints/notes/conversation.ts
+++ b/packages/backend/src/server/api/endpoints/notes/conversation.ts
@@ -9,7 +9,7 @@ import { Notes } from '@/models/index';
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -28,11 +28,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -44,7 +44,7 @@ export const meta = {
id: 'e1035875-9551-45ec-afa8-1ded1fcb53c8',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index ec05e5ea94..6adbc821e7 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -25,7 +25,7 @@ setInterval(() => {
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
limit: {
duration: ms('1hour'),
@@ -113,12 +113,12 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
createdNote: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -173,7 +173,7 @@ export const meta = {
id: 'b390d7e1-8a5e-46ed-b625-06271cafd3d3',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts
index 0f6f99c7c1..9e080d9e99 100644
--- a/packages/backend/src/server/api/endpoints/notes/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/delete.ts
@@ -10,7 +10,7 @@ import { Users } from '@/models/index';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:notes',
@@ -39,7 +39,7 @@ export const meta = {
id: 'fe8d7103-0ea8-4ec3-814d-f8b401dc69e9',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 d5d39c3040..78da6a3b00 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 { genId } from '@/misc/gen-id';
export const meta = {
tags: ['notes', 'favorites'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:favorites',
@@ -32,7 +32,7 @@ export const meta = {
id: 'a402c12b-34dd-41d2-97d8-4d2ffd96a1a6',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 62f32633b3..3f3d50f0d5 100644
--- a/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/favorites/delete.ts
@@ -8,7 +8,7 @@ import { NoteFavorites } from '@/models/index';
export const meta = {
tags: ['notes', 'favorites'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:favorites',
@@ -31,7 +31,7 @@ export const meta = {
id: 'b625fc69-635e-45e9-86f4-dbefbef35af5',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
index 8f45b541dc..5a47fb9e08 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 { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
limit: {
@@ -22,15 +22,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 14831a127c..cac8b7d8a9 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -43,11 +43,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -59,7 +59,7 @@ export const meta = {
id: '0332fc13-6ab2-4427-ae80-a9fadffd1a6b',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 bac2437056..9683df4611 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -18,7 +18,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
limit: {
@@ -63,11 +63,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -79,7 +79,7 @@ export const meta = {
id: '620763f4-f621-4533-ab33-0577a1a3c342',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 334e754d0d..7776644124 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -54,11 +54,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -70,7 +70,7 @@ export const meta = {
id: '45a6eb02-7695-4393-b023-dd3be9aaaefd',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 8ae90233a9..81b3844365 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -13,7 +13,7 @@ import { generateMutedNoteThreadQuery } from '../../common/generate-muted-note-t
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
following: {
@@ -40,15 +40,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 7562c6d7f8..79b558e65e 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
@@ -6,7 +6,7 @@ import { Brackets, In } from 'typeorm';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
limit: {
@@ -21,15 +21,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 a08709e329..77387cacb2 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
@@ -17,7 +17,7 @@ import { genId } from '@/misc/gen-id';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:votes',
@@ -68,7 +68,7 @@ export const meta = {
id: '85a5377e-b1e9-4617-b0b9-5bea73331e49',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts
index d29893e203..5205a78171 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts
@@ -10,7 +10,7 @@ import { NoteReaction } from '@/models/entities/note-reaction';
export const meta = {
tags: ['notes', 'reactions'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -41,11 +41,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'NoteReaction',
},
},
@@ -57,7 +57,7 @@ export const meta = {
id: '263fff3d-d0e1-4af4-bea7-8408059b451a',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 28403d821f..1b42781ceb 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions/create.ts
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['reactions', 'notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:reactions',
@@ -41,7 +41,7 @@ export const meta = {
id: '20ef5475-9f38-4e4c-bd33-de6d979498ec',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 2b1ce1e21e..1d686b5971 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
@@ -9,7 +9,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['reactions', 'notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:reactions',
@@ -38,7 +38,7 @@ export const meta = {
id: '92f4426d-4196-4125-aa5b-02943e2ec8fc',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index abfd928db1..f71d23146a 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -12,7 +12,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -34,11 +34,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -50,7 +50,7 @@ export const meta = {
id: '12908022-2e21-46cd-ba6a-3edaf6093f46',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts
index 12efe94be1..62c56534e1 100644
--- a/packages/backend/src/server/api/endpoints/notes/replies.ts
+++ b/packages/backend/src/server/api/endpoints/notes/replies.ts
@@ -10,7 +10,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -32,15 +32,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 85daf7e48e..87eaffe2f1 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
@@ -56,15 +56,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 5ff3258954..e75212b14b 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -13,7 +13,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
query: {
@@ -50,18 +50,18 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
errors: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/show.ts b/packages/backend/src/server/api/endpoints/notes/show.ts
index b645f86793..feb94be1a1 100644
--- a/packages/backend/src/server/api/endpoints/notes/show.ts
+++ b/packages/backend/src/server/api/endpoints/notes/show.ts
@@ -8,7 +8,7 @@ import { Notes } from '@/models/index';
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -17,8 +17,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
@@ -29,7 +29,7 @@ export const meta = {
id: '24fcbfc6-2e37-42b6-8388-c29b3861a08d',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/state.ts b/packages/backend/src/server/api/endpoints/notes/state.ts
index 5bbe3ec86d..c3e9090bbf 100644
--- a/packages/backend/src/server/api/endpoints/notes/state.ts
+++ b/packages/backend/src/server/api/endpoints/notes/state.ts
@@ -6,7 +6,7 @@ import { NoteFavorites, Notes, NoteThreadMutings, NoteWatchings } from '@/models
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
noteId: {
@@ -15,24 +15,24 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
isFavorited: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isWatching: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isMutedThread: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 0bd55f8988..a8b50d90f6 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
@@ -10,7 +10,7 @@ import readNote from '@/services/note/read';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -27,7 +27,7 @@ export const meta = {
id: '5ff67ada-ed3b-2e71-8e87-a1a421e177d2',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 756f1b9fd4..f76b526ce1 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
@@ -8,7 +8,7 @@ import { NoteThreadMutings } from '@/models';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -25,7 +25,7 @@ export const meta = {
id: 'bddd57ac-ceb3-b29d-4334-86ea5fae481a',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 4acfed35e9..8be2861aec 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -16,7 +16,7 @@ import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
limit: {
@@ -61,15 +61,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 98a45ace18..ed069cb75a 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -13,7 +13,7 @@ import { Notes } from '@/models';
export const meta = {
tags: ['notes'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
noteId: {
@@ -25,8 +25,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
},
errors: {
@@ -36,7 +36,7 @@ export const meta = {
id: 'bea9b03f-36e0-49c5-a4db-627a029f8971',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
index 2c1e1c7390..8db543d328 100644
--- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
@@ -10,7 +10,7 @@ import { Notes, Users } from '@/models/index';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:notes',
@@ -33,7 +33,7 @@ export const meta = {
id: 'efd4a259-2442-496b-8dd7-b255aa1a160f',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 c3b273937c..89de73fb9d 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
@@ -11,7 +11,7 @@ import { Brackets } from 'typeorm';
export const meta = {
tags: ['notes', 'lists'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
listId: {
@@ -60,11 +60,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -76,7 +76,7 @@ export const meta = {
id: '8fb1fbd5-e476-4c37-9fb0-43d55b63a2ff',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/watching/create.ts b/packages/backend/src/server/api/endpoints/notes/watching/create.ts
index d55ae20023..6433c6bc2a 100644
--- a/packages/backend/src/server/api/endpoints/notes/watching/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/watching/create.ts
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -25,7 +25,7 @@ export const meta = {
id: 'ea0e37a6-90a3-4f58-ba6b-c328ca206fc7',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notes/watching/delete.ts b/packages/backend/src/server/api/endpoints/notes/watching/delete.ts
index 522ae6360a..3e9faa2b23 100644
--- a/packages/backend/src/server/api/endpoints/notes/watching/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/watching/delete.ts
@@ -8,7 +8,7 @@ import { ApiError } from '../../../error';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -25,7 +25,7 @@ export const meta = {
id: '09b3695c-f72c-4731-a428-7cff825fc82e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notifications/create.ts b/packages/backend/src/server/api/endpoints/notifications/create.ts
index f78c6e1219..bd8a7ba1b7 100644
--- a/packages/backend/src/server/api/endpoints/notifications/create.ts
+++ b/packages/backend/src/server/api/endpoints/notifications/create.ts
@@ -5,7 +5,7 @@ import { createNotification } from '@/services/create-notification';
export const meta = {
tags: ['notifications'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:notifications',
@@ -25,7 +25,7 @@ export const meta = {
errors: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user, token) => {
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 f14a91a3dc..4cec38a95d 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
@@ -5,10 +5,10 @@ import { Notifications } from '@/models/index';
export const meta = {
tags: ['notifications', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:notifications',
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/notifications/read.ts b/packages/backend/src/server/api/endpoints/notifications/read.ts
index 891bfd30d6..7e23bc234d 100644
--- a/packages/backend/src/server/api/endpoints/notifications/read.ts
+++ b/packages/backend/src/server/api/endpoints/notifications/read.ts
@@ -9,7 +9,7 @@ import { ApiError } from '../../error';
export const meta = {
tags: ['notifications', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:notifications',
@@ -26,7 +26,7 @@ export const meta = {
id: 'efa929d5-05b5-47d1-beec-e6a4dbed011e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/page-push.ts b/packages/backend/src/server/api/endpoints/page-push.ts
index f5da35e783..61c0160f83 100644
--- a/packages/backend/src/server/api/endpoints/page-push.ts
+++ b/packages/backend/src/server/api/endpoints/page-push.ts
@@ -6,7 +6,7 @@ import { Users, Pages } from '@/models/index';
import { ApiError } from '../error';
export const meta = {
- requireCredential: true as const,
+ requireCredential: true,
secure: true,
params: {
@@ -30,7 +30,7 @@ export const meta = {
id: '4a13ad31-6729-46b4-b9af-e86b265c2e74',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts
index dcf916909d..7ee50fbdfa 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 { ApiError } from '../../error';
export const meta = {
tags: ['pages'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:pages',
@@ -65,8 +65,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Page',
},
@@ -82,7 +82,7 @@ export const meta = {
id: '4650348e-301c-499a-83c9-6aa988c66bc1',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/pages/delete.ts b/packages/backend/src/server/api/endpoints/pages/delete.ts
index b3a37446d2..aeda823e52 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 { ID } from '@/misc/cafy-id';
export const meta = {
tags: ['pages'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:pages',
@@ -30,7 +30,7 @@ export const meta = {
id: '8b741b3e-2c22-44b3-a15f-29949aa1601e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/pages/featured.ts b/packages/backend/src/server/api/endpoints/pages/featured.ts
index b32964c49d..7f0d58b350 100644
--- a/packages/backend/src/server/api/endpoints/pages/featured.ts
+++ b/packages/backend/src/server/api/endpoints/pages/featured.ts
@@ -4,18 +4,18 @@ import { Pages } from '@/models/index';
export const meta = {
tags: ['pages'],
- requireCredential: false as const,
+ requireCredential: false,
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Page',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts
index deff8cc021..c479f637a9 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 { genId } from '@/misc/gen-id';
export const meta = {
tags: ['pages'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:page-likes',
@@ -37,7 +37,7 @@ export const meta = {
id: 'cc98a8a2-0dc3-4123-b198-62c71df18ed3',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/pages/show.ts b/packages/backend/src/server/api/endpoints/pages/show.ts
index 4a98ec0736..5cda5386d5 100644
--- a/packages/backend/src/server/api/endpoints/pages/show.ts
+++ b/packages/backend/src/server/api/endpoints/pages/show.ts
@@ -8,7 +8,7 @@ import { Page } from '@/models/entities/page';
export const meta = {
tags: ['pages'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
pageId: {
@@ -25,8 +25,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Page',
},
@@ -37,7 +37,7 @@ export const meta = {
id: '222120c0-3ead-4528-811b-b96f233388d7',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/pages/unlike.ts b/packages/backend/src/server/api/endpoints/pages/unlike.ts
index f6e74dcf1a..cca5e5b5a9 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 { Pages, PageLikes } from '@/models/index';
export const meta = {
tags: ['pages'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:page-likes',
@@ -30,7 +30,7 @@ export const meta = {
id: 'f5e586b0-ce93-4050-b0e3-7f31af5259ee',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts
index 06c63706ae..991085ee09 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 { Not } from 'typeorm';
export const meta = {
tags: ['pages'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:pages',
@@ -88,7 +88,7 @@ export const meta = {
id: '2298a392-d4a1-44c5-9ebb-ac1aeaa5a9ab',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/ping.ts b/packages/backend/src/server/api/endpoints/ping.ts
index 2130ce54e0..3eab70ae2e 100644
--- a/packages/backend/src/server/api/endpoints/ping.ts
+++ b/packages/backend/src/server/api/endpoints/ping.ts
@@ -1,7 +1,7 @@
import define from '../define';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
tags: ['meta'],
@@ -9,16 +9,16 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
pong: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts
index 548871a02c..ff0e22555f 100644
--- a/packages/backend/src/server/api/endpoints/pinned-users.ts
+++ b/packages/backend/src/server/api/endpoints/pinned-users.ts
@@ -7,21 +7,21 @@ import { User } from '@/models/entities/user';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/promo/read.ts b/packages/backend/src/server/api/endpoints/promo/read.ts
index 271d887899..8d8c60d755 100644
--- a/packages/backend/src/server/api/endpoints/promo/read.ts
+++ b/packages/backend/src/server/api/endpoints/promo/read.ts
@@ -9,7 +9,7 @@ import { genId } from '@/misc/gen-id';
export const meta = {
tags: ['notes'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
noteId: {
@@ -24,7 +24,7 @@ export const meta = {
id: 'd785b897-fcd3-4fe9-8fc3-b85c26e6c932',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 2a29e58914..af1aeb4311 100644
--- a/packages/backend/src/server/api/endpoints/request-reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts
@@ -11,7 +11,7 @@ import { genId } from '@/misc/gen-id';
import { IsNull } from 'typeorm';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
limit: {
duration: ms('1hour'),
@@ -31,7 +31,7 @@ export const meta = {
errors: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/reset-db.ts b/packages/backend/src/server/api/endpoints/reset-db.ts
index caae137d76..e99dc9db15 100644
--- a/packages/backend/src/server/api/endpoints/reset-db.ts
+++ b/packages/backend/src/server/api/endpoints/reset-db.ts
@@ -4,7 +4,7 @@ import { ApiError } from '../error';
import { resetDb } from '@/db/postgre';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
params: {
},
@@ -12,7 +12,7 @@ export const meta = {
errors: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts
index 3cf89f3758..a7366584b1 100644
--- a/packages/backend/src/server/api/endpoints/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/reset-password.ts
@@ -6,7 +6,7 @@ import { Users, UserProfiles, PasswordResetRequests } from '@/models/index';
import { ApiError } from '../error';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
params: {
token: {
@@ -21,7 +21,7 @@ export const meta = {
errors: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts
index 2613416ee3..1ad2c54ab5 100644
--- a/packages/backend/src/server/api/endpoints/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/server-info.ts
@@ -3,7 +3,7 @@ import * as si from 'systeminformation';
import define from '../define';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
desc: {
},
@@ -12,7 +12,7 @@ export const meta = {
params: {
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts
index 75f7a94985..9879ef2adf 100644
--- a/packages/backend/src/server/api/endpoints/stats.ts
+++ b/packages/backend/src/server/api/endpoints/stats.ts
@@ -3,7 +3,7 @@ import { NoteReactions, Notes, Users } from '@/models/index';
import { federationChart, driveChart } from '@/services/chart/index';
export const meta = {
- requireCredential: false as const,
+ requireCredential: false,
tags: ['meta'],
@@ -11,40 +11,40 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
notesCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
originalNotesCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
usersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
originalUsersCount: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
instances: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
driveUsageLocal: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
driveUsageRemote: {
- type: 'number' as const,
- optional: false as const, nullable: false as const,
+ type: 'number',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async () => {
diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts
index 8657a0b77c..ae3e9ce77a 100644
--- a/packages/backend/src/server/api/endpoints/sw/register.ts
+++ b/packages/backend/src/server/api/endpoints/sw/register.ts
@@ -7,7 +7,7 @@ import { SwSubscriptions } from '@/models/index';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
endpoint: {
@@ -24,21 +24,21 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
state: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
enum: ['already-subscribed', 'subscribed'],
},
key: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/sw/unregister.ts b/packages/backend/src/server/api/endpoints/sw/unregister.ts
index 67a2ed0a96..6f569e9417 100644
--- a/packages/backend/src/server/api/endpoints/sw/unregister.ts
+++ b/packages/backend/src/server/api/endpoints/sw/unregister.ts
@@ -5,14 +5,14 @@ import { SwSubscriptions } from '../../../../models';
export const meta = {
tags: ['account'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
endpoint: {
validator: $.str,
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/username/available.ts b/packages/backend/src/server/api/endpoints/username/available.ts
index ede03eeb10..74120fc406 100644
--- a/packages/backend/src/server/api/endpoints/username/available.ts
+++ b/packages/backend/src/server/api/endpoints/username/available.ts
@@ -5,7 +5,7 @@ import { Users, UsedUsernames } from '@/models/index';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
username: {
@@ -14,16 +14,16 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
available: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps) => {
diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts
index fdcf59f777..6b11ec0f01 100644
--- a/packages/backend/src/server/api/endpoints/users.ts
+++ b/packages/backend/src/server/api/endpoints/users.ts
@@ -7,7 +7,7 @@ import { generateBlockQueryForUsers } from '../common/generate-block-query';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
limit: {
@@ -53,15 +53,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts
index 91da853e6e..d4152fbf50 100644
--- a/packages/backend/src/server/api/endpoints/users/clips.ts
+++ b/packages/backend/src/server/api/endpoints/users/clips.ts
@@ -25,7 +25,7 @@ export const meta = {
validator: $.optional.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts
index d9c0ed7623..6214ab40ba 100644
--- a/packages/backend/src/server/api/endpoints/users/followers.ts
+++ b/packages/backend/src/server/api/endpoints/users/followers.ts
@@ -9,7 +9,7 @@ import { toPunyNullable } from '@/misc/convert-host';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
userId: {
@@ -39,11 +39,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Following',
},
},
@@ -61,7 +61,7 @@ export const meta = {
id: '3c6a84db-d619-26af-ca14-06232a21df8a',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index a77fedd68e..76112eab25 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 { toPunyNullable } from '@/misc/convert-host';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
userId: {
@@ -39,11 +39,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Following',
},
},
@@ -61,7 +61,7 @@ export const meta = {
id: 'f6cdb0df-c19f-ec5c-7dbb-0ba84a1f92ba',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 bffa4a502e..c5f08b4c94 100644
--- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
@@ -25,7 +25,7 @@ export const meta = {
validator: $.optional.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 5852da1849..d886d3355a 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
@@ -10,7 +10,7 @@ import { Notes, Users } from '@/models/index';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
userId: {
@@ -24,12 +24,22 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ user: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
+ },
+ weight: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ },
},
},
@@ -40,7 +50,7 @@ export const meta = {
id: 'e6965129-7b2a-40a4-bae2-cd84cd434822',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/create.ts b/packages/backend/src/server/api/endpoints/users/groups/create.ts
index bbe041122e..25e29de01c 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/create.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/create.ts
@@ -8,7 +8,7 @@ import { UserGroupJoining } from '@/models/entities/user-group-joining';
export const meta = {
tags: ['groups'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -19,11 +19,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserGroup',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/delete.ts b/packages/backend/src/server/api/endpoints/users/groups/delete.ts
index 5a38428ca4..f30ab78ca0 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/delete.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/delete.ts
@@ -7,7 +7,7 @@ import { UserGroups } from '@/models/index';
export const meta = {
tags: ['groups'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -24,7 +24,7 @@ export const meta = {
id: '63dbd64c-cd77-413f-8e08-61781e210b38',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts
index 45b6c39dc3..7061db538b 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts
@@ -9,7 +9,7 @@ import { UserGroupJoining } from '@/models/entities/user-group-joining';
export const meta = {
tags: ['groups', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -26,7 +26,7 @@ export const meta = {
id: '98c11eca-c890-4f42-9806-c8c8303ebb5e',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts
index 03ce90aa3d..f5ca3dec8b 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts
@@ -7,7 +7,7 @@ import { UserGroupInvitations } from '@/models/index';
export const meta = {
tags: ['groups', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -24,7 +24,7 @@ export const meta = {
id: 'ad7471d4-2cd9-44b4-ac68-e7136b4ce656',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/invite.ts b/packages/backend/src/server/api/endpoints/users/groups/invite.ts
index 68ce0f1adc..3b7a4edb81 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/invite.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/invite.ts
@@ -11,7 +11,7 @@ import { createNotification } from '@/services/create-notification';
export const meta = {
tags: ['groups', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -50,7 +50,7 @@ export const meta = {
id: 'ee0f58b4-b529-4d13-b761-b9a3e69f97e6',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/joined.ts b/packages/backend/src/server/api/endpoints/users/groups/joined.ts
index ad18a2f121..ab48b1910d 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/joined.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/joined.ts
@@ -5,20 +5,20 @@ import { Not, In } from 'typeorm';
export const meta = {
tags: ['groups', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:user-groups',
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserGroup',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/leave.ts b/packages/backend/src/server/api/endpoints/users/groups/leave.ts
index af259d28ef..d2fcdab301 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/leave.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/leave.ts
@@ -7,7 +7,7 @@ import { UserGroups, UserGroupJoinings } from '@/models/index';
export const meta = {
tags: ['groups', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -30,7 +30,7 @@ export const meta = {
id: 'b6d6e0c2-ef8a-9bb8-653d-79f4a3107c69',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/owned.ts b/packages/backend/src/server/api/endpoints/users/groups/owned.ts
index d11d04b84d..6193a71019 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/owned.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/owned.ts
@@ -4,20 +4,20 @@ import { UserGroups } from '@/models/index';
export const meta = {
tags: ['groups', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:user-groups',
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserGroup',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/pull.ts b/packages/backend/src/server/api/endpoints/users/groups/pull.ts
index e4c5d1f9ee..785bea140d 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/pull.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/pull.ts
@@ -8,7 +8,7 @@ import { UserGroups, UserGroupJoinings } from '@/models/index';
export const meta = {
tags: ['groups', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -41,7 +41,7 @@ export const meta = {
id: '1546eed5-4414-4dea-81c1-b0aec4f6d2af',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/show.ts b/packages/backend/src/server/api/endpoints/users/groups/show.ts
index 55b86d0e53..eb26eac2a8 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/show.ts
@@ -7,7 +7,7 @@ import { UserGroups, UserGroupJoinings } from '@/models/index';
export const meta = {
tags: ['groups', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:user-groups',
@@ -18,8 +18,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserGroup',
},
@@ -30,7 +30,7 @@ export const meta = {
id: 'ea04751e-9b7e-487b-a509-330fb6bd6b9b',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
index 6795f1dd21..4b1c8fbbdb 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
@@ -8,7 +8,7 @@ import { UserGroups, UserGroupJoinings } from '@/models/index';
export const meta = {
tags: ['groups', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -23,8 +23,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserGroup',
},
@@ -47,7 +47,7 @@ export const meta = {
id: 'd31bebee-196d-42c2-9a3e-9474d4be6cc4',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/update.ts b/packages/backend/src/server/api/endpoints/users/groups/update.ts
index 0d188af738..6caf903555 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/update.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/update.ts
@@ -7,7 +7,7 @@ import { UserGroups } from '@/models/index';
export const meta = {
tags: ['groups'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:user-groups',
@@ -22,8 +22,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserGroup',
},
@@ -34,7 +34,7 @@ export const meta = {
id: '9081cda3-7a9e-4fac-a6ce-908d70f282f6',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 4c89d1b7eb..945b511628 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/create.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/create.ts
@@ -7,7 +7,7 @@ import { UserList } from '@/models/entities/user-list';
export const meta = {
tags: ['lists'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -18,11 +18,11 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserList',
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 0f2495dc29..3183d2a09c 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 { UserLists } from '@/models/index';
export const meta = {
tags: ['lists'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -24,7 +24,7 @@ export const meta = {
id: '78436795-db79-42f5-b1e2-55ea2cf19166',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
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 4cf7db69a3..ae66b0aacc 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/list.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/list.ts
@@ -4,20 +4,20 @@ import { UserLists } from '@/models/index';
export const meta = {
tags: ['lists', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserList',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 980d90c614..4c74aefa8a 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/pull.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/pull.ts
@@ -9,7 +9,7 @@ import { UserLists, UserListJoinings, Users } from '@/models/index';
export const meta = {
tags: ['lists', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -36,7 +36,7 @@ export const meta = {
id: '588e7f72-c744-4a61-b180-d354e912bda2',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 a0ca314f36..8b50c475b0 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/push.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/push.ts
@@ -9,7 +9,7 @@ import { UserLists, UserListJoinings, Blockings } from '@/models/index';
export const meta = {
tags: ['lists', 'users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -48,7 +48,7 @@ export const meta = {
id: '990232c5-3f9d-4d83-9f3f-ef27b6332a4b',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 5822c06971..06555c1a88 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 { UserLists } from '@/models/index';
export const meta = {
tags: ['lists', 'account'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
@@ -18,8 +18,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserList',
},
@@ -30,7 +30,7 @@ export const meta = {
id: '7bc05c21-1d7a-41ae-88f1-66820f4dc686',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 50fcf6ff54..02b0d5fe18 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 { UserLists } from '@/models/index';
export const meta = {
tags: ['lists'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'write:account',
@@ -22,8 +22,8 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'UserList',
},
@@ -34,7 +34,7 @@ export const meta = {
id: '796666fe-3dff-4d39-becb-8a5932c1d5b7',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 2069eb60ab..99158fb0ae 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -66,11 +66,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'Note',
},
},
@@ -82,7 +82,7 @@ export const meta = {
id: '27e494ba-2ac2-48e8-893b-10d4d8c2387b',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts
index 9fb985dc12..6e003dd1af 100644
--- a/packages/backend/src/server/api/endpoints/users/pages.ts
+++ b/packages/backend/src/server/api/endpoints/users/pages.ts
@@ -25,7 +25,7 @@ export const meta = {
validator: $.optional.type(ID),
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index 6f68aca184..312d4dbf23 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -9,7 +9,7 @@ import { ApiError } from '../../error';
export const meta = {
tags: ['users', 'reactions'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
userId: {
@@ -39,11 +39,11 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'NoteReaction',
},
},
@@ -55,7 +55,7 @@ export const meta = {
id: '673a7dd2-6924-1093-e0c0-e68456ceae5c',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts
index 5e640330c8..9ea39eb2dd 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 { generateBlockedUserQuery, generateBlockQueryForUsers } from '../../comm
export const meta = {
tags: ['users'],
- requireCredential: true as const,
+ requireCredential: true,
kind: 'read:account',
@@ -25,15 +25,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'UserDetailed',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/relation.ts b/packages/backend/src/server/api/endpoints/users/relation.ts
index 629c1d0c1d..7e319ca105 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 { Users } from '@/models/index';
export const meta = {
tags: ['users'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
userId: {
@@ -15,92 +15,91 @@ export const meta = {
},
res: {
+ optional: false, nullable: false,
oneOf: [
{
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
isFollowing: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
hasPendingFollowRequestFromYou: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
hasPendingFollowRequestToYou: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isFollowed: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isBlocking: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isBlocked: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isMuted: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
},
},
{
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
properties: {
id: {
- type: 'string' as const,
- optional: false as const, nullable: false as const,
+ type: 'string',
+ optional: false, nullable: false,
format: 'id',
},
isFollowing: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
hasPendingFollowRequestFromYou: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
hasPendingFollowRequestToYou: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isFollowed: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isBlocking: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isBlocked: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
isMuted: {
- type: 'boolean' as const,
- optional: false as const, nullable: false as const,
+ type: 'boolean',
+ optional: false, nullable: false,
},
},
},
},
],
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 bd80710fec..ed2aa7bb26 100644
--- a/packages/backend/src/server/api/endpoints/users/report-abuse.ts
+++ b/packages/backend/src/server/api/endpoints/users/report-abuse.ts
@@ -13,7 +13,7 @@ import { fetchMeta } from '@/misc/fetch-meta';
export const meta = {
tags: ['users'],
- requireCredential: true as const,
+ requireCredential: true,
params: {
userId: {
@@ -44,7 +44,7 @@ export const meta = {
id: '35e166f5-05fb-4f87-a2d5-adb42676d48f',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
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 b9cf332f47..d67625e624 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
@@ -8,7 +8,7 @@ import { User } from '@/models/entities/user';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
username: {
@@ -31,15 +31,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'User',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
@@ -112,6 +112,6 @@ export default define(meta, async (ps, me) => {
.getMany();
}
- return await Users.packMany(users, me, { detail: ps.detail });
+ return await Users.packMany(users, me, { detail: !!ps.detail });
}
});
diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 35f1988fce..26f818afcc 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -7,7 +7,7 @@ import { Brackets } from 'typeorm';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
query: {
@@ -36,15 +36,15 @@ export const meta = {
},
res: {
- type: 'array' as const,
- optional: false as const, nullable: false as const,
+ type: 'array',
+ optional: false, nullable: false,
items: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
+ type: 'object',
+ optional: false, nullable: false,
ref: 'User',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts
index e8b2a781f7..92910e9ed8 100644
--- a/packages/backend/src/server/api/endpoints/users/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/show.ts
@@ -11,7 +11,7 @@ import { User } from '@/models/entities/user';
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
userId: {
@@ -32,9 +32,20 @@ export const meta = {
},
res: {
- type: 'object' as const,
- optional: false as const, nullable: false as const,
- ref: 'User',
+ optional: false, nullable: false,
+ oneOf: [
+ {
+ type: 'object',
+ ref: 'UserDetailed',
+ },
+ {
+ type: 'array',
+ items: {
+ type: 'object',
+ ref: 'UserDetailed',
+ }
+ },
+ ]
},
errors: {
@@ -42,7 +53,7 @@ export const meta = {
message: 'Failed to resolve remote user.',
code: 'FAILED_TO_RESOLVE_REMOTE_USER',
id: 'ef7b9be4-9cba-4e6f-ab41-90ed171c7d3c',
- kind: 'server' as const,
+ kind: 'server',
},
noSuchUser: {
@@ -51,7 +62,7 @@ export const meta = {
id: '4362f8dc-731f-4ad8-a694-be5a88922a24',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/users/stats.ts b/packages/backend/src/server/api/endpoints/users/stats.ts
index 84bbd16f0b..381e433479 100644
--- a/packages/backend/src/server/api/endpoints/users/stats.ts
+++ b/packages/backend/src/server/api/endpoints/users/stats.ts
@@ -7,7 +7,7 @@ import { DriveFiles, Followings, NoteFavorites, NoteReactions, Notes, PageLikes,
export const meta = {
tags: ['users'],
- requireCredential: false as const,
+ requireCredential: false,
params: {
userId: {
@@ -22,7 +22,7 @@ export const meta = {
id: '9e638e45-3b25-4ef7-8f95-07e8498f1819',
},
},
-};
+} as const;
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, me) => {
diff --git a/packages/backend/src/server/api/openapi/schemas.ts b/packages/backend/src/server/api/openapi/schemas.ts
index 723b3e884a..eb42667fd5 100644
--- a/packages/backend/src/server/api/openapi/schemas.ts
+++ b/packages/backend/src/server/api/openapi/schemas.ts
@@ -1,6 +1,6 @@
-import { refs, Schema } from '@/misc/schema';
+import { refs, MinimumSchema } from '@/misc/schema';
-export function convertSchemaToOpenApiSchema(schema: Schema) {
+export function convertSchemaToOpenApiSchema(schema: MinimumSchema) {
const res: any = schema;
if (schema.type === 'object' && schema.properties) {
@@ -15,6 +15,10 @@ export function convertSchemaToOpenApiSchema(schema: Schema) {
res.items = convertSchemaToOpenApiSchema(schema.items);
}
+ if (schema.anyOf) res.anyOf = schema.anyOf.map(convertSchemaToOpenApiSchema);
+ if (schema.oneOf) res.oneOf = schema.oneOf.map(convertSchemaToOpenApiSchema);
+ if (schema.allOf) res.allOf = schema.allOf.map(convertSchemaToOpenApiSchema);
+
if (schema.ref) {
res.$ref = `#/components/schemas/${schema.ref}`;
}
diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts
index 168f1b3448..e70c26f5e5 100644
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -36,7 +36,7 @@ export interface UserStreamTypes {
updateUserProfile: UserProfile;
mute: User;
unmute: User;
- follow: Packed<'User'>;
+ follow: Packed<'UserDetailedNotMe'>;
unfollow: Packed<'User'>;
userAdded: Packed<'User'>;
}
@@ -46,7 +46,7 @@ export interface MainStreamTypes {
mention: Packed<'Note'>;
reply: Packed<'Note'>;
renote: Packed<'Note'>;
- follow: Packed<'User'>;
+ follow: Packed<'UserDetailedNotMe'>;
followed: Packed<'User'>;
unfollow: Packed<'User'>;
meUpdated: Packed<'User'>;
diff --git a/packages/backend/src/services/chart/core.ts b/packages/backend/src/services/chart/core.ts
index f97fa521d3..e406449f4f 100644
--- a/packages/backend/src/services/chart/core.ts
+++ b/packages/backend/src/services/chart/core.ts
@@ -7,7 +7,7 @@
import * as nestedProperty from 'nested-property';
import autobind from 'autobind-decorator';
import Logger from '../logger';
-import { SimpleSchema } from '@/misc/simple-schema';
+import { Schema } from '@/misc/schema';
import { EntitySchema, getRepository, Repository, LessThan, Between } from 'typeorm';
import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '@/prelude/time';
import { getChartInsertLock } from '@/misc/app-lock';
@@ -57,7 +57,7 @@ export default abstract class Chart<T extends Record<string, any>> {
diff: DeepPartial<T>;
group: string | null;
}[] = [];
- public schema: SimpleSchema;
+ public schema: Schema;
protected repositoryForHour: Repository<Log>;
protected repositoryForDay: Repository<Log>;
@@ -71,7 +71,7 @@ export default abstract class Chart<T extends Record<string, any>> {
protected abstract fetchActual(group: string | null): Promise<DeepPartial<T>>;
@autobind
- private static convertSchemaToFlatColumnDefinitions(schema: SimpleSchema) {
+ private static convertSchemaToFlatColumnDefinitions(schema: Schema) {
const columns = {} as Record<string, unknown>;
const flatColumns = (x: Obj, path?: string) => {
for (const [k, v] of Object.entries(x)) {
@@ -183,7 +183,7 @@ export default abstract class Chart<T extends Record<string, any>> {
}
@autobind
- public static schemaToEntity(name: string, schema: SimpleSchema, grouped = false): {
+ public static schemaToEntity(name: string, schema: Schema, grouped = false): {
hour: EntitySchema,
day: EntitySchema,
} {
@@ -233,7 +233,7 @@ export default abstract class Chart<T extends Record<string, any>> {
};
}
- constructor(name: string, schema: SimpleSchema, grouped = false) {
+ constructor(name: string, schema: Schema, grouped = false) {
this.name = name;
this.schema = schema;
@@ -573,8 +573,8 @@ export default abstract class Chart<T extends Record<string, any>> {
}
}
-export function convertLog(logSchema: SimpleSchema): SimpleSchema {
- const v: SimpleSchema = JSON.parse(JSON.stringify(logSchema)); // copy
+export function convertLog(logSchema: Schema): Schema {
+ const v: Schema = JSON.parse(JSON.stringify(logSchema)); // copy
if (v.type === 'number') {
v.type = 'array';
v.items = {
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index 45bd226588..bc5ac275b5 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -14,6 +14,7 @@ import { instanceChart, perUserFollowingChart } from '@/services/chart/index';
import { genId } from '@/misc/gen-id';
import { createNotification } from '../create-notification';
import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error';
+import { Packed } from '@/misc/schema';
const logger = new Logger('following/create');
@@ -89,8 +90,8 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
Users.pack(followee.id, follower, {
detail: true,
}).then(packed => {
- publishUserEvent(follower.id, 'follow', packed);
- publishMainStream(follower.id, 'follow', packed);
+ publishUserEvent(follower.id, 'follow', packed as Packed<"UserDetailedNotMe">);
+ publishMainStream(follower.id, 'follow', packed as Packed<"UserDetailedNotMe">);
});
}
--
GitLab