refactor(api): ♻️ Simplify route schema definitions

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()

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(),

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),

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(),
+        }),
     },
 });
 

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(),
     }),

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({

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({

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: {

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(),
     }),

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(),
     }),

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: {

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: {

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: {

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(),

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: {

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()

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: {

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: {

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: {

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: {

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())

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(),
     }),

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(),

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(),
     }),

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()),
     }),

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),

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()

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

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),
     }),
 };

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(),
     }),

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()

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),
     }),
 };

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(),
     }),

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(),
     }),

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),
     }),
 };

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: {

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(),
     }),

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(),

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),
     }),
 };

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: {

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: {

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()),
     }),

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

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: {

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: {

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: {

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({

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(),

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(),
     }),
 };
 

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(),
     }),

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(),
     }),

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: {

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: {

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: {

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: {

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

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),
     }),
 };

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()

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(),
     }),

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

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(),

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(),

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(),

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(),

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()

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: {

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(),
     }),

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(),
     }),

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(),
     }),

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()

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(),

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(),

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(),

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(),