diff --git a/api/api/auth/login/index.ts b/api/api/auth/login/index.ts index 5d076751..93d59c89 100644 --- a/api/api/auth/login/index.ts +++ b/api/api/auth/login/index.ts @@ -10,7 +10,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager"; -export const schemas = { +const schemas = { form: z.object({ identifier: z .string() diff --git a/api/api/auth/redirect/index.ts b/api/api/auth/redirect/index.ts index 6e281c8f..c35033ec 100644 --- a/api/api/auth/redirect/index.ts +++ b/api/api/auth/redirect/index.ts @@ -6,7 +6,7 @@ import { and, eq } from "drizzle-orm"; import { z } from "zod"; import { config } from "~/packages/config-manager"; -export const schemas = { +const schemas = { query: z.object({ redirect_uri: z.string().url(), client_id: z.string(), diff --git a/api/api/auth/reset/index.ts b/api/api/auth/reset/index.ts index fbdd6842..9a04d4b0 100644 --- a/api/api/auth/reset/index.ts +++ b/api/api/auth/reset/index.ts @@ -7,7 +7,7 @@ import type { Context } from "hono"; import { z } from "zod"; import { config } from "~/packages/config-manager"; -export const schemas = { +const schemas = { form: z.object({ token: z.string().min(1), password: z.string().min(3).max(100), diff --git a/api/api/v1/accounts/:id/block.ts b/api/api/v1/accounts/:id/block.ts index 2855a77d..a53d316a 100644 --- a/api/api/v1/accounts/:id/block.ts +++ b/api/api/v1/accounts/:id/block.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/block", @@ -46,7 +40,9 @@ const route = createRoute({ }, }, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, }); diff --git a/api/api/v1/accounts/:id/follow.ts b/api/api/v1/accounts/:id/follow.ts index d4ad42bf..9457183f 100644 --- a/api/api/v1/accounts/:id/follow.ts +++ b/api/api/v1/accounts/:id/follow.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v1/accounts/:id/followers.ts b/api/api/v1/accounts/:id/followers.ts index 01e41a63..805a2fc7 100644 --- a/api/api/v1/accounts/:id/followers.ts +++ b/api/api/v1/accounts/:id/followers.ts @@ -1,4 +1,4 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Timeline, User } from "@versia/kit/db"; import { RolePermissions, Users } from "@versia/kit/tables"; @@ -7,11 +7,11 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(40).optional().default(20), }), param: z.object({ diff --git a/api/api/v1/accounts/:id/following.ts b/api/api/v1/accounts/:id/following.ts index d3af4254..f12e00c1 100644 --- a/api/api/v1/accounts/:id/following.ts +++ b/api/api/v1/accounts/:id/following.ts @@ -1,4 +1,4 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Timeline, User } from "@versia/kit/db"; import { RolePermissions, Users } from "@versia/kit/tables"; @@ -7,11 +7,11 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(40).optional().default(20), }), param: z.object({ diff --git a/api/api/v1/accounts/:id/index.ts b/api/api/v1/accounts/:id/index.ts index 0fbc6e67..00ce43b5 100644 --- a/api/api/v1/accounts/:id/index.ts +++ b/api/api/v1/accounts/:id/index.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "get", path: "/api/v1/accounts/{id}", @@ -24,7 +18,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/mute.ts b/api/api/v1/accounts/:id/mute.ts index 07411f73..052f5f74 100644 --- a/api/api/v1/accounts/:id/mute.ts +++ b/api/api/v1/accounts/:id/mute.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v1/accounts/:id/note.ts b/api/api/v1/accounts/:id/note.ts index 97f4c3f6..c6d1877b 100644 --- a/api/api/v1/accounts/:id/note.ts +++ b/api/api/v1/accounts/:id/note.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v1/accounts/:id/pin.ts b/api/api/v1/accounts/:id/pin.ts index 44ded7cf..5276f79b 100644 --- a/api/api/v1/accounts/:id/pin.ts +++ b/api/api/v1/accounts/:id/pin.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/pin", @@ -28,7 +22,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/refetch.ts b/api/api/v1/accounts/:id/refetch.ts index 1768d20b..222b6c56 100644 --- a/api/api/v1/accounts/:id/refetch.ts +++ b/api/api/v1/accounts/:id/refetch.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/refetch", @@ -25,7 +19,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/remove_from_followers.ts b/api/api/v1/accounts/:id/remove_from_followers.ts index ba86596e..e545ddf8 100644 --- a/api/api/v1/accounts/:id/remove_from_followers.ts +++ b/api/api/v1/accounts/:id/remove_from_followers.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/remove_from_followers", @@ -28,7 +22,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/roles/:role_id/index.ts b/api/api/v1/accounts/:id/roles/:role_id/index.ts index fb44512e..23c34339 100644 --- a/api/api/v1/accounts/:id/roles/:role_id/index.ts +++ b/api/api/v1/accounts/:id/roles/:role_id/index.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), role_id: z.string().uuid(), diff --git a/api/api/v1/accounts/:id/roles/index.ts b/api/api/v1/accounts/:id/roles/index.ts index cd8f3010..d3718d05 100644 --- a/api/api/v1/accounts/:id/roles/index.ts +++ b/api/api/v1/accounts/:id/roles/index.ts @@ -5,12 +5,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "get", path: "/api/v1/accounts/{id}/roles", @@ -21,7 +15,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/statuses.ts b/api/api/v1/accounts/:id/statuses.ts index 8b5e2a9d..04b30cf6 100644 --- a/api/api/v1/accounts/:id/statuses.ts +++ b/api/api/v1/accounts/:id/statuses.ts @@ -1,4 +1,4 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Note, Timeline, User } from "@versia/kit/db"; import { Notes, RolePermissions } from "@versia/kit/tables"; @@ -7,14 +7,14 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(40).optional().default(20), only_media: z .string() diff --git a/api/api/v1/accounts/:id/unblock.ts b/api/api/v1/accounts/:id/unblock.ts index 8d4287e2..162478f7 100644 --- a/api/api/v1/accounts/:id/unblock.ts +++ b/api/api/v1/accounts/:id/unblock.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/unblock", @@ -28,7 +22,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/unfollow.ts b/api/api/v1/accounts/:id/unfollow.ts index 0e681bd7..2c24fe9e 100644 --- a/api/api/v1/accounts/:id/unfollow.ts +++ b/api/api/v1/accounts/:id/unfollow.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/unfollow", @@ -28,7 +22,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/unmute.ts b/api/api/v1/accounts/:id/unmute.ts index 33e56f8b..3977276c 100644 --- a/api/api/v1/accounts/:id/unmute.ts +++ b/api/api/v1/accounts/:id/unmute.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/unmute", @@ -28,7 +22,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/:id/unpin.ts b/api/api/v1/accounts/:id/unpin.ts index 859fc6e7..a729957f 100644 --- a/api/api/v1/accounts/:id/unpin.ts +++ b/api/api/v1/accounts/:id/unpin.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/accounts/{id}/unpin", @@ -28,7 +22,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/accounts/familiar_followers/index.ts b/api/api/v1/accounts/familiar_followers/index.ts index 1a9dfc7d..be9632f2 100644 --- a/api/api/v1/accounts/familiar_followers/index.ts +++ b/api/api/v1/accounts/familiar_followers/index.ts @@ -5,7 +5,7 @@ import { RolePermissions, type Users } from "@versia/kit/tables"; import { type InferSelectModel, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ id: z .array(z.string().uuid()) diff --git a/api/api/v1/accounts/id/index.ts b/api/api/v1/accounts/id/index.ts index 406aae7d..a2c4a050 100644 --- a/api/api/v1/accounts/id/index.ts +++ b/api/api/v1/accounts/id/index.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { query: z.object({ username: z.string().min(1).max(512).toLowerCase(), }), diff --git a/api/api/v1/accounts/index.ts b/api/api/v1/accounts/index.ts index 21bdcdc3..302b18cc 100644 --- a/api/api/v1/accounts/index.ts +++ b/api/api/v1/accounts/index.ts @@ -9,7 +9,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager"; -export const schemas = { +const schemas = { json: z.object({ username: z.string(), email: z.string().toLowerCase(), diff --git a/api/api/v1/accounts/lookup/index.ts b/api/api/v1/accounts/lookup/index.ts index 71f42886..8763d1e4 100644 --- a/api/api/v1/accounts/lookup/index.ts +++ b/api/api/v1/accounts/lookup/index.ts @@ -8,7 +8,7 @@ import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { query: z.object({ acct: z.string().min(1).max(512).toLowerCase(), }), diff --git a/api/api/v1/accounts/relationships/index.ts b/api/api/v1/accounts/relationships/index.ts index b018f162..5b4b4bcd 100644 --- a/api/api/v1/accounts/relationships/index.ts +++ b/api/api/v1/accounts/relationships/index.ts @@ -4,7 +4,7 @@ import { Relationship } from "@versia/kit/db"; import { RolePermissions } from "@versia/kit/tables"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ id: z.array(z.string().uuid()).min(1).max(10).or(z.string().uuid()), }), diff --git a/api/api/v1/accounts/search/index.ts b/api/api/v1/accounts/search/index.ts index 9d20faaf..78efea7e 100644 --- a/api/api/v1/accounts/search/index.ts +++ b/api/api/v1/accounts/search/index.ts @@ -7,7 +7,7 @@ import stringComparison from "string-comparison"; import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; -export const schemas = { +const schemas = { query: z.object({ q: z.string().min(1).max(512).regex(userAddressValidator), limit: z.coerce.number().int().min(1).max(80).default(40), diff --git a/api/api/v1/accounts/update_credentials/index.ts b/api/api/v1/accounts/update_credentials/index.ts index c303a69e..c9ddeec1 100644 --- a/api/api/v1/accounts/update_credentials/index.ts +++ b/api/api/v1/accounts/update_credentials/index.ts @@ -14,7 +14,7 @@ import { MediaManager } from "~/classes/media/media-manager"; import { config } from "~/packages/config-manager/index.ts"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { json: z.object({ display_name: z .string() diff --git a/api/api/v1/apps/index.ts b/api/api/v1/apps/index.ts index ee007ac9..d9ba9bf0 100644 --- a/api/api/v1/apps/index.ts +++ b/api/api/v1/apps/index.ts @@ -4,7 +4,7 @@ import { createRoute } from "@hono/zod-openapi"; import { Application } from "@versia/kit/db"; import { z } from "zod"; -export const schemas = { +const schemas = { json: z.object({ client_name: z.string().trim().min(1).max(100), redirect_uris: z diff --git a/api/api/v1/blocks/index.ts b/api/api/v1/blocks/index.ts index c6229af7..90da37d8 100644 --- a/api/api/v1/blocks/index.ts +++ b/api/api/v1/blocks/index.ts @@ -1,15 +1,15 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Timeline, User } from "@versia/kit/db"; import { RolePermissions, Users } from "@versia/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(40), }), }; diff --git a/api/api/v1/emojis/:id/index.ts b/api/api/v1/emojis/:id/index.ts index 7d7f1e08..9cb731d2 100644 --- a/api/api/v1/emojis/:id/index.ts +++ b/api/api/v1/emojis/:id/index.ts @@ -10,7 +10,7 @@ import { MediaManager } from "~/classes/media/media-manager"; import { config } from "~/packages/config-manager"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v1/emojis/index.ts b/api/api/v1/emojis/index.ts index 1c02d7d5..41aca058 100644 --- a/api/api/v1/emojis/index.ts +++ b/api/api/v1/emojis/index.ts @@ -10,7 +10,7 @@ import { MediaManager } from "~/classes/media/media-manager"; import { config } from "~/packages/config-manager"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { json: z.object({ shortcode: z .string() diff --git a/api/api/v1/favourites/index.ts b/api/api/v1/favourites/index.ts index 96715a9e..45dcada6 100644 --- a/api/api/v1/favourites/index.ts +++ b/api/api/v1/favourites/index.ts @@ -1,15 +1,15 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Note, Timeline } from "@versia/kit/db"; import { Notes, RolePermissions } from "@versia/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(40), }), }; diff --git a/api/api/v1/follow_requests/:account_id/authorize.ts b/api/api/v1/follow_requests/:account_id/authorize.ts index 00e12c95..371f5948 100644 --- a/api/api/v1/follow_requests/:account_id/authorize.ts +++ b/api/api/v1/follow_requests/:account_id/authorize.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ account_id: z.string().uuid(), }), diff --git a/api/api/v1/follow_requests/:account_id/reject.ts b/api/api/v1/follow_requests/:account_id/reject.ts index 0cf6100c..7341744b 100644 --- a/api/api/v1/follow_requests/:account_id/reject.ts +++ b/api/api/v1/follow_requests/:account_id/reject.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ account_id: z.string().uuid(), }), diff --git a/api/api/v1/follow_requests/index.ts b/api/api/v1/follow_requests/index.ts index d9465b75..f83c01fe 100644 --- a/api/api/v1/follow_requests/index.ts +++ b/api/api/v1/follow_requests/index.ts @@ -1,15 +1,15 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Timeline, User } from "@versia/kit/db"; import { RolePermissions, Users } from "@versia/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(40), }), }; diff --git a/api/api/v1/markers/index.ts b/api/api/v1/markers/index.ts index a6fa2f58..92f2b881 100644 --- a/api/api/v1/markers/index.ts +++ b/api/api/v1/markers/index.ts @@ -1,4 +1,4 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import type { Marker as ApiMarker } from "@versia/client/types"; import { db } from "@versia/kit/db"; @@ -6,11 +6,11 @@ import { Markers, RolePermissions } from "@versia/kit/tables"; import { type SQL, and, eq } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { markers: z.object({ home: z .object({ - last_read_id: z.string().regex(idValidator), + last_read_id: z.string().uuid(), version: z.number(), updated_at: z.string(), }) @@ -18,7 +18,7 @@ export const schemas = { .optional(), notifications: z .object({ - last_read_id: z.string().regex(idValidator), + last_read_id: z.string().uuid(), version: z.number(), updated_at: z.string(), }) @@ -70,11 +70,8 @@ const routePost = createRoute({ ] as const, request: { query: z.object({ - "home[last_read_id]": z.string().regex(idValidator).optional(), - "notifications[last_read_id]": z - .string() - .regex(idValidator) - .optional(), + "home[last_read_id]": z.string().uuid().optional(), + "notifications[last_read_id]": z.string().uuid().optional(), }), }, responses: { diff --git a/api/api/v1/media/:id/index.ts b/api/api/v1/media/:id/index.ts index d90f41f0..41153f95 100644 --- a/api/api/v1/media/:id/index.ts +++ b/api/api/v1/media/:id/index.ts @@ -8,7 +8,7 @@ import { MediaManager } from "~/classes/media/media-manager"; import { config } from "~/packages/config-manager/index.ts"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v1/media/index.ts b/api/api/v1/media/index.ts index 942245f6..3eefbff7 100644 --- a/api/api/v1/media/index.ts +++ b/api/api/v1/media/index.ts @@ -9,7 +9,7 @@ import { MediaManager } from "~/classes/media/media-manager"; import { config } from "~/packages/config-manager/index.ts"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { form: z.object({ file: z.instanceof(File), thumbnail: z.instanceof(File).optional(), diff --git a/api/api/v1/mutes/index.ts b/api/api/v1/mutes/index.ts index 05c3a287..3c6fd1ae 100644 --- a/api/api/v1/mutes/index.ts +++ b/api/api/v1/mutes/index.ts @@ -1,15 +1,15 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Timeline, User } from "@versia/kit/db"; import { RolePermissions, Users } from "@versia/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(40), }), }; diff --git a/api/api/v1/notifications/:id/dismiss.ts b/api/api/v1/notifications/:id/dismiss.ts index 175a41bd..143f5a0c 100644 --- a/api/api/v1/notifications/:id/dismiss.ts +++ b/api/api/v1/notifications/:id/dismiss.ts @@ -5,12 +5,6 @@ import { RolePermissions } from "@versia/kit/tables"; import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/notifications/{id}/dismiss", @@ -23,7 +17,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/notifications/:id/index.ts b/api/api/v1/notifications/:id/index.ts index 7fde89b6..c1a5cbe6 100644 --- a/api/api/v1/notifications/:id/index.ts +++ b/api/api/v1/notifications/:id/index.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "get", path: "/api/v1/notifications/{id}", @@ -24,7 +18,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/notifications/destroy_multiple/index.ts b/api/api/v1/notifications/destroy_multiple/index.ts index 969ee912..0ddc6ab4 100644 --- a/api/api/v1/notifications/destroy_multiple/index.ts +++ b/api/api/v1/notifications/destroy_multiple/index.ts @@ -3,7 +3,7 @@ import { createRoute } from "@hono/zod-openapi"; import { RolePermissions } from "@versia/kit/tables"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ "ids[]": z.array(z.string().uuid()), }), diff --git a/api/api/v1/notifications/index.ts b/api/api/v1/notifications/index.ts index 2a88052e..b0053d05 100644 --- a/api/api/v1/notifications/index.ts +++ b/api/api/v1/notifications/index.ts @@ -1,16 +1,16 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Notification, Timeline } from "@versia/kit/db"; import { Notifications, RolePermissions } from "@versia/kit/tables"; import { and, eq, gt, gte, inArray, lt, not, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z .object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(15), exclude_types: z .enum([ @@ -62,7 +62,7 @@ export const schemas = { ]) .array() .optional(), - account_id: z.string().regex(idValidator).optional(), + account_id: z.string().uuid().optional(), }) .refine((val) => { // Can't use both exclude_types and types diff --git a/api/api/v1/roles/:id/index.ts b/api/api/v1/roles/:id/index.ts index c552d70b..4f0de903 100644 --- a/api/api/v1/roles/:id/index.ts +++ b/api/api/v1/roles/:id/index.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const routeGet = createRoute({ method: "get", path: "/api/v1/roles/{id}", @@ -22,7 +16,9 @@ const routeGet = createRoute({ }), ], request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { @@ -56,7 +52,9 @@ const routePatch = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), body: { content: { "application/json": { @@ -100,7 +98,9 @@ const routeDelete = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 204: { diff --git a/api/api/v1/statuses/:id/context.ts b/api/api/v1/statuses/:id/context.ts index c35cb743..7e26d503 100644 --- a/api/api/v1/statuses/:id/context.ts +++ b/api/api/v1/statuses/:id/context.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "get", path: "/api/v1/statuses/{id}/context", @@ -23,7 +17,9 @@ const route = createRoute({ ] as const, summary: "Get status context", request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/statuses/:id/favourite.ts b/api/api/v1/statuses/:id/favourite.ts index d3c63968..287b54c8 100644 --- a/api/api/v1/statuses/:id/favourite.ts +++ b/api/api/v1/statuses/:id/favourite.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/statuses/{id}/favourite", @@ -26,7 +20,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/statuses/:id/favourited_by.ts b/api/api/v1/statuses/:id/favourited_by.ts index 07393f26..e9b6efd9 100644 --- a/api/api/v1/statuses/:id/favourited_by.ts +++ b/api/api/v1/statuses/:id/favourited_by.ts @@ -1,4 +1,4 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Note, Timeline, User } from "@versia/kit/db"; import { RolePermissions, Users } from "@versia/kit/tables"; @@ -7,11 +7,11 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(40), }), param: z.object({ diff --git a/api/api/v1/statuses/:id/index.ts b/api/api/v1/statuses/:id/index.ts index 04e36294..6908b019 100644 --- a/api/api/v1/statuses/:id/index.ts +++ b/api/api/v1/statuses/:id/index.ts @@ -1,4 +1,4 @@ -import { apiRoute, auth, idValidator, jsonOrForm } from "@/api"; +import { apiRoute, auth, jsonOrForm } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Attachment, Note } from "@versia/kit/db"; import { RolePermissions } from "@versia/kit/tables"; @@ -8,9 +8,9 @@ import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager/index.ts"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ - id: z.string().regex(idValidator), + id: z.string().uuid(), }), json: z .object({ @@ -27,7 +27,7 @@ export const schemas = { .optional(), content_type: z.string().optional().default("text/plain"), media_ids: z - .array(z.string().regex(idValidator)) + .array(z.string().uuid()) .max(config.validation.max_media_attachments) .default([]), spoiler_text: z.string().max(255).optional(), diff --git a/api/api/v1/statuses/:id/pin.ts b/api/api/v1/statuses/:id/pin.ts index 51de919d..6bab4f78 100644 --- a/api/api/v1/statuses/:id/pin.ts +++ b/api/api/v1/statuses/:id/pin.ts @@ -1,4 +1,4 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Note, db } from "@versia/kit/db"; import { RolePermissions } from "@versia/kit/tables"; @@ -7,9 +7,9 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ - id: z.string().regex(idValidator), + id: z.string().uuid(), }), }; diff --git a/api/api/v1/statuses/:id/reblog.ts b/api/api/v1/statuses/:id/reblog.ts index 37dd6607..4ab0bfd0 100644 --- a/api/api/v1/statuses/:id/reblog.ts +++ b/api/api/v1/statuses/:id/reblog.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v1/statuses/:id/reblogged_by.ts b/api/api/v1/statuses/:id/reblogged_by.ts index 48e61e72..a2a3d476 100644 --- a/api/api/v1/statuses/:id/reblogged_by.ts +++ b/api/api/v1/statuses/:id/reblogged_by.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v1/statuses/:id/source.ts b/api/api/v1/statuses/:id/source.ts index 51d6748a..486392ad 100644 --- a/api/api/v1/statuses/:id/source.ts +++ b/api/api/v1/statuses/:id/source.ts @@ -7,12 +7,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "get", path: "/api/v1/statuses/{id}/source", @@ -27,7 +21,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/statuses/:id/unfavourite.ts b/api/api/v1/statuses/:id/unfavourite.ts index f1715d61..7914a11e 100644 --- a/api/api/v1/statuses/:id/unfavourite.ts +++ b/api/api/v1/statuses/:id/unfavourite.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/statuses/{id}/unfavourite", @@ -26,7 +20,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/statuses/:id/unpin.ts b/api/api/v1/statuses/:id/unpin.ts index 52d3f920..2849a251 100644 --- a/api/api/v1/statuses/:id/unpin.ts +++ b/api/api/v1/statuses/:id/unpin.ts @@ -6,12 +6,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/statuses/{id}/unpin", @@ -26,7 +20,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/statuses/:id/unreblog.ts b/api/api/v1/statuses/:id/unreblog.ts index a8a315dd..471092b8 100644 --- a/api/api/v1/statuses/:id/unreblog.ts +++ b/api/api/v1/statuses/:id/unreblog.ts @@ -7,12 +7,6 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "post", path: "/api/v1/statuses/{id}/unreblog", @@ -27,7 +21,9 @@ const route = createRoute({ }), ] as const, request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/api/v1/statuses/index.ts b/api/api/v1/statuses/index.ts index f0397400..93919372 100644 --- a/api/api/v1/statuses/index.ts +++ b/api/api/v1/statuses/index.ts @@ -8,7 +8,7 @@ import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager/index.ts"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { json: z .object({ status: z diff --git a/api/api/v1/timelines/home.ts b/api/api/v1/timelines/home.ts index d2e6fa4e..ebbc27b6 100644 --- a/api/api/v1/timelines/home.ts +++ b/api/api/v1/timelines/home.ts @@ -1,15 +1,15 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Note, Timeline } from "@versia/kit/db"; import { Notes, RolePermissions } from "@versia/kit/tables"; import { and, eq, gt, gte, inArray, lt, or, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(20), }), }; diff --git a/api/api/v1/timelines/public.ts b/api/api/v1/timelines/public.ts index f865dc97..ab18f127 100644 --- a/api/api/v1/timelines/public.ts +++ b/api/api/v1/timelines/public.ts @@ -1,15 +1,15 @@ -import { apiRoute, auth, idValidator } from "@/api"; +import { apiRoute, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { Note, Timeline } from "@versia/kit/db"; import { Notes, RolePermissions } from "@versia/kit/tables"; import { and, eq, gt, gte, inArray, lt, or, sql } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { query: z.object({ - max_id: z.string().regex(idValidator).optional(), - since_id: z.string().regex(idValidator).optional(), - min_id: z.string().regex(idValidator).optional(), + max_id: z.string().uuid().optional(), + since_id: z.string().uuid().optional(), + min_id: z.string().uuid().optional(), limit: z.coerce.number().int().min(1).max(80).default(20), local: z .string() diff --git a/api/api/v2/filters/:id/index.ts b/api/api/v2/filters/:id/index.ts index d07f1910..ed3d45b9 100644 --- a/api/api/v2/filters/:id/index.ts +++ b/api/api/v2/filters/:id/index.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z.string().uuid(), }), diff --git a/api/api/v2/filters/index.ts b/api/api/v2/filters/index.ts index 070f5b41..2bb49d24 100644 --- a/api/api/v2/filters/index.ts +++ b/api/api/v2/filters/index.ts @@ -5,7 +5,7 @@ import { FilterKeywords, Filters, RolePermissions } from "@versia/kit/tables"; import type { SQL } from "drizzle-orm"; import { z } from "zod"; -export const schemas = { +const schemas = { json: z.object({ title: z.string().trim().min(1).max(100), context: z diff --git a/api/api/v2/media/index.ts b/api/api/v2/media/index.ts index 5ebcde89..7fb57a1b 100644 --- a/api/api/v2/media/index.ts +++ b/api/api/v2/media/index.ts @@ -9,7 +9,7 @@ import { MediaManager } from "~/classes/media/media-manager"; import { config } from "~/packages/config-manager/index.ts"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { form: z.object({ file: z.instanceof(File), thumbnail: z.instanceof(File).optional(), diff --git a/api/api/v2/search/index.ts b/api/api/v2/search/index.ts index f768bcc3..a877e797 100644 --- a/api/api/v2/search/index.ts +++ b/api/api/v2/search/index.ts @@ -9,7 +9,7 @@ import { searchManager } from "~/classes/search/search-manager"; import { config } from "~/packages/config-manager"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { query: z.object({ q: z.string().trim(), type: z.string().optional(), diff --git a/api/inbox/index.ts b/api/inbox/index.ts index c9085827..9b466fe1 100644 --- a/api/inbox/index.ts +++ b/api/inbox/index.ts @@ -4,7 +4,7 @@ import type { Entity } from "@versia/federation/types"; import { z } from "zod"; import { InboxJobType, inboxQueue } from "~/classes/queues/inbox"; -export const schemas = { +const schemas = { header: z.object({ "x-signature": z.string().optional(), "x-nonce": z.string().optional(), diff --git a/api/media/:hash/:name/index.ts b/api/media/:hash/:name/index.ts index fa1cc754..ec8b9e53 100644 --- a/api/media/:hash/:name/index.ts +++ b/api/media/:hash/:name/index.ts @@ -4,7 +4,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ hash: z.string(), name: z.string(), diff --git a/api/media/proxy/:id.ts b/api/media/proxy/:id.ts index fbf085d6..5fe97b00 100644 --- a/api/media/proxy/:id.ts +++ b/api/media/proxy/:id.ts @@ -6,7 +6,7 @@ import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ id: z .string() diff --git a/api/objects/:id/index.ts b/api/objects/:id/index.ts index 0c91d592..dd6b9030 100644 --- a/api/objects/:id/index.ts +++ b/api/objects/:id/index.ts @@ -12,18 +12,14 @@ import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager"; import { ErrorSchema, type KnownEntity } from "~/types/api"; -export const schemas = { - param: z.object({ - id: z.string().uuid(), - }), -}; - const route = createRoute({ method: "get", path: "/objects/{id}", summary: "Get object", request: { - params: schemas.param, + params: z.object({ + id: z.string().uuid(), + }), }, responses: { 200: { diff --git a/api/users/:uuid/inbox/index.ts b/api/users/:uuid/inbox/index.ts index a5579cf0..fa003880 100644 --- a/api/users/:uuid/inbox/index.ts +++ b/api/users/:uuid/inbox/index.ts @@ -5,7 +5,7 @@ import { z } from "zod"; import { InboxJobType, inboxQueue } from "~/classes/queues/inbox"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ uuid: z.string().uuid(), }), diff --git a/api/users/:uuid/index.ts b/api/users/:uuid/index.ts index 2997c49c..01b3f06c 100644 --- a/api/users/:uuid/index.ts +++ b/api/users/:uuid/index.ts @@ -6,7 +6,7 @@ import { z } from "zod"; import { ApiError } from "~/classes/errors/api-error"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ uuid: z.string().uuid(), }), diff --git a/api/users/:uuid/outbox/index.ts b/api/users/:uuid/outbox/index.ts index a9b03503..8884ed00 100644 --- a/api/users/:uuid/outbox/index.ts +++ b/api/users/:uuid/outbox/index.ts @@ -12,7 +12,7 @@ import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { param: z.object({ uuid: z.string().uuid(), }), diff --git a/api/well-known/webfinger/index.ts b/api/well-known/webfinger/index.ts index fb69628a..5d6f6f28 100644 --- a/api/well-known/webfinger/index.ts +++ b/api/well-known/webfinger/index.ts @@ -16,7 +16,7 @@ import { ApiError } from "~/classes/errors/api-error"; import { config } from "~/packages/config-manager"; import { ErrorSchema } from "~/types/api"; -export const schemas = { +const schemas = { query: z.object({ resource: z .string() diff --git a/plugins/openid/routes/oauth/callback.ts b/plugins/openid/routes/oauth/callback.ts index e6e34fc1..3af10035 100644 --- a/plugins/openid/routes/oauth/callback.ts +++ b/plugins/openid/routes/oauth/callback.ts @@ -10,7 +10,7 @@ import { ApiError } from "~/classes/errors/api-error.ts"; import type { PluginType } from "../../index.ts"; import { automaticOidcFlow } from "../../utils.ts"; -export const schemas = { +const schemas = { query: z.object({ client_id: z.string().optional(), flow: z.string(), diff --git a/plugins/openid/routes/oauth/revoke.ts b/plugins/openid/routes/oauth/revoke.ts index e8a11b3d..4a58ffc7 100644 --- a/plugins/openid/routes/oauth/revoke.ts +++ b/plugins/openid/routes/oauth/revoke.ts @@ -5,7 +5,7 @@ import { and, eq } from "@versia/kit/drizzle"; import { Tokens } from "@versia/kit/tables"; import type { PluginType } from "../../index.ts"; -export const schemas = { +const schemas = { json: z.object({ client_id: z.string(), client_secret: z.string(), diff --git a/plugins/openid/routes/oauth/sso.ts b/plugins/openid/routes/oauth/sso.ts index 4bd6912b..8168443d 100644 --- a/plugins/openid/routes/oauth/sso.ts +++ b/plugins/openid/routes/oauth/sso.ts @@ -10,7 +10,7 @@ import { import type { PluginType } from "../../index.ts"; import { oauthRedirectUri } from "../../utils.ts"; -export const schemas = { +const schemas = { query: z.object({ issuer: z.string(), client_id: z.string().optional(), diff --git a/plugins/openid/routes/oauth/token.ts b/plugins/openid/routes/oauth/token.ts index b2b42c13..01ef7aab 100644 --- a/plugins/openid/routes/oauth/token.ts +++ b/plugins/openid/routes/oauth/token.ts @@ -5,7 +5,7 @@ import { and, eq } from "@versia/kit/drizzle"; import { Tokens } from "@versia/kit/tables"; import type { PluginType } from "../../index.ts"; -export const schemas = { +const schemas = { json: z.object({ code: z.string().optional(), code_verifier: z.string().optional(),