refactor: 🚚 Move more utilities into packages

packages/api/package.json

@@ -63,6 +63,11 @@
         "zod-openapi": "catalog:",
         "@scalar/hono-api-reference": "catalog:",
         "hono-rate-limiter": "catalog:",
-        "ip-matching": "catalog:"
+        "ip-matching": "catalog:",
+        "qs": "catalog:",
+        "magic-regexp": "catalog:",
+        "altcha-lib": "catalog:",
+        "@hono/zod-validator": "catalog:",
+        "zod-validation-error": "catalog:"
     }
 }

packages/api/routes/api/auth/login/index.ts

@@ -1,4 +1,5 @@
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { Application, User } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
@@ -10,7 +11,6 @@ import { describeRoute } from "hono-openapi";
 import { validator } from "hono-openapi/zod";
 import { SignJWT } from "jose";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 const returnError = (
     context: Context,

packages/api/routes/api/auth/redirect/index.ts

@@ -1,3 +1,4 @@
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { db } from "@versia/kit/db";
 import { Applications, Tokens } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
@@ -5,7 +6,6 @@ import { and, eq } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 /**
  * OAuth Code flow

packages/api/routes/api/auth/reset/index.ts

@@ -1,3 +1,4 @@
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { User } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
@@ -7,7 +8,6 @@ import type { Context } from "hono";
 import { describeRoute } from "hono-openapi";
 import { validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 const returnError = (
     context: Context,

packages/api/routes/api/v1/accounts/[id]/block.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/feed.atom.ts

@@ -1,9 +1,9 @@
 import { RolePermission } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 import { getFeed } from "@/rss";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/accounts/[id]/feed.rss.ts

@@ -1,9 +1,9 @@
 import { RolePermission } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 import { getFeed } from "@/rss";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/accounts/[id]/follow.ts

@@ -4,11 +4,11 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/followers.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/accounts/[id]/following.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/accounts/[id]/index.ts

@@ -3,9 +3,9 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/accounts/[id]/mute.ts

@@ -3,11 +3,11 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 import {
     RelationshipJobType,
     relationshipQueue,

packages/api/routes/api/v1/accounts/[id]/note.ts

@@ -3,11 +3,11 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/pin.ts

@@ -2,10 +2,10 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/refetch.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { User } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/remove_from_followers.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.ts

@@ -4,11 +4,11 @@ import {
     Role as RoleSchema,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { Role } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 
 export default apiRoute((app) => {
     app.post(

packages/api/routes/api/v1/accounts/[id]/roles/index.ts

@@ -1,9 +1,9 @@
 import { Role as RoleSchema } from "@versia/client/schemas";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Role } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) => {
     app.get(

packages/api/routes/api/v1/accounts/[id]/statuses.ts

@@ -4,13 +4,13 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import { and, eq, gt, gte, inArray, isNull, lt, or, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/accounts/[id]/unblock.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/unfollow.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/unmute.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/[id]/unpin.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withUserParam } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/accounts/familiar_followers/index.ts

@@ -4,13 +4,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, qsQuery } from "@versia/kit/api";
 import { db, User } from "@versia/kit/db";
 import type { Users } from "@versia/kit/tables";
 import { type InferSelectModel, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, qsQuery } from "@/api";
 import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/accounts/index.ts

@@ -1,5 +1,12 @@
 import { Account as AccountSchema, zBoolean } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import {
+    apiRoute,
+    auth,
+    handleZodError,
+    jsonOrForm,
+    qsQuery,
+} from "@versia/kit/api";
 import { User } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
@@ -8,7 +15,6 @@ import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, jsonOrForm, qsQuery } from "@/api";
 import { tempmailDomains } from "@/tempmail";
 import { rateLimit } from "../../../../middlewares/rate-limit.ts";
 

packages/api/routes/api/v1/accounts/lookup/index.ts

@@ -3,14 +3,15 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Instance, User } from "@versia/kit/db";
+import { parseUserAddress } from "@versia/kit/parsers";
 import { Users } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
 import { and, eq, isNull } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, parseUserAddress } from "@/api";
 import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/accounts/relationships/index.ts

@@ -5,11 +5,11 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, qsQuery } from "@versia/kit/api";
 import { Relationship } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, qsQuery } from "@/api";
 import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/accounts/search/index.ts

@@ -4,14 +4,15 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { User } from "@versia/kit/db";
+import { parseUserAddress } from "@versia/kit/parsers";
 import { Users } from "@versia/kit/tables";
 import { eq, ilike, not, or, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import stringComparison from "string-comparison";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, parseUserAddress } from "@/api";
 import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/accounts/update_credentials/index.ts

@@ -4,7 +4,9 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { Emoji, Media, User } from "@versia/kit/db";
+import { versiaTextToHtml } from "@versia/kit/parsers";
 import { Users } from "@versia/kit/tables";
 import * as VersiaEntities from "@versia/sdk/entities";
 import { config } from "@versia-server/config";
@@ -12,10 +14,8 @@ import { and, eq, isNull } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 import { mergeAndDeduplicate } from "@/lib";
 import { sanitizedHtmlStrip } from "@/sanitization";
-import { contentToHtml } from "~/classes/functions/status";
 import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
 
 export default apiRoute((app) =>
@@ -242,7 +242,7 @@ export default apiRoute((app) =>
 
             if (note) {
                 self.source.note = note;
-                self.note = await contentToHtml(
+                self.note = await versiaTextToHtml(
                     new VersiaEntities.TextContentFormat({
                         "text/markdown": {
                             content: note,
@@ -329,7 +329,7 @@ export default apiRoute((app) =>
                 self.source.fields = [];
                 for (const field of fields_attributes) {
                     // Can be Markdown or plaintext, also has emojis
-                    const parsedName = await contentToHtml(
+                    const parsedName = await versiaTextToHtml(
                         new VersiaEntities.TextContentFormat({
                             "text/markdown": {
                                 content: field.name,
@@ -340,7 +340,7 @@ export default apiRoute((app) =>
                         true,
                     );
 
-                    const parsedValue = await contentToHtml(
+                    const parsedValue = await versiaTextToHtml(
                         new VersiaEntities.TextContentFormat({
                             "text/markdown": {
                                 content: field.value,

packages/api/routes/api/v1/accounts/verify_credentials/index.ts

@@ -1,8 +1,8 @@
 import { Account } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/apps/index.ts

@@ -3,12 +3,12 @@ import {
     CredentialApplication as CredentialApplicationSchema,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { Application } from "@versia/kit/db";
 import { randomUUIDv7 } from "bun";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError, jsonOrForm } from "@/api";
 import { randomString } from "@/math";
 import { rateLimit } from "../../../../middlewares/rate-limit.ts";
 

packages/api/routes/api/v1/apps/verify_credentials/index.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { Application } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/blocks/index.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/challenges/index.ts

@@ -1,9 +1,9 @@
 import { Challenge } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth } from "@/api";
 import { generateChallenge } from "@/challenges";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/custom_emojis/index.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { Emoji } from "@versia/kit/db";
 import { Emojis } from "@versia/kit/tables";
 import { and, eq, isNull, or } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/emojis/[id]/index.ts

@@ -3,17 +3,17 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
-import { config } from "@versia-server/config";
-import { describeRoute } from "hono-openapi";
-import { resolver, validator } from "hono-openapi/zod";
-import { z } from "zod";
 import {
     apiRoute,
     auth,
     handleZodError,
     jsonOrForm,
     withEmojiParam,
-} from "@/api";
+} from "@versia/kit/api";
+import { config } from "@versia-server/config";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
+import { z } from "zod";
 import { mimeLookup } from "@/content_types";
 
 export default apiRoute((app) => {

packages/api/routes/api/v1/emojis/index.ts

@@ -3,6 +3,7 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { Emoji, Media } from "@versia/kit/db";
 import { Emojis } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
@@ -11,7 +12,6 @@ import { and, eq, isNull, or } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 import { mimeLookup } from "@/content_types";
 
 export default apiRoute((app) =>

packages/api/routes/api/v1/favourites/index.ts

@@ -1,12 +1,12 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/follow_requests/[account_id]/authorize.ts

@@ -4,11 +4,11 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Relationship, User } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/follow_requests/[account_id]/reject.ts

@@ -4,11 +4,11 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Relationship, User } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/follow_requests/index.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/frontend/config/index.ts

@@ -1,8 +1,8 @@
+import { apiRoute } from "@versia/kit/api";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/instance/extended_description.ts

@@ -1,9 +1,9 @@
 import { ExtendedDescription as ExtendedDescriptionSchema } from "@versia/client/schemas";
+import { apiRoute } from "@versia/kit/api";
+import { markdownToHtml } from "@versia/kit/markdown";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute } from "@/api";
-import { markdownParse } from "~/classes/functions/status";
 
 export default apiRoute((app) =>
     app.get(
@@ -27,7 +27,7 @@ export default apiRoute((app) =>
             },
         }),
         async (context) => {
-            const content = await markdownParse(
+            const content = await markdownToHtml(
                 config.instance.extended_description_path?.content ??
                     "This is a [Versia](https://versia.pub) server with the default extended description.",
             );

packages/api/routes/api/v1/instance/index.ts

@@ -1,13 +1,13 @@
 import { InstanceV1 as InstanceV1Schema } from "@versia/client/schemas";
+import { apiRoute } from "@versia/kit/api";
 import { Instance, Note, User } from "@versia/kit/db";
+import { markdownToHtml } from "@versia/kit/markdown";
 import { Users } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
 import { and, eq, isNull } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import type { z } from "zod";
-import { apiRoute } from "@/api";
-import { markdownParse } from "~/classes/functions/status";
 import manifest from "~/package.json" with { type: "json" };
 
 export default apiRoute((app) =>
@@ -60,7 +60,7 @@ export default apiRoute((app) =>
                   }
                 | undefined;
 
-            const content = await markdownParse(
+            const content = await markdownToHtml(
                 config.instance.extended_description_path?.content ??
                     "This is a [Versia](https://versia.pub) server with the default extended description.",
             );

packages/api/routes/api/v1/instance/privacy_policy.ts

@@ -1,9 +1,9 @@
 import { PrivacyPolicy as PrivacyPolicySchema } from "@versia/client/schemas";
+import { apiRoute } from "@versia/kit/api";
+import { markdownToHtml } from "@versia/kit/markdown";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute } from "@/api";
-import { markdownParse } from "~/classes/functions/status";
 
 export default apiRoute((app) =>
     app.get(
@@ -27,7 +27,7 @@ export default apiRoute((app) =>
             },
         }),
         async (context) => {
-            const content = await markdownParse(
+            const content = await markdownToHtml(
                 config.instance.privacy_policy_path?.content ??
                     "This instance has not provided any privacy policy.",
             );

packages/api/routes/api/v1/instance/rules.ts

@@ -1,9 +1,9 @@
 import { Rule as RuleSchema } from "@versia/client/schemas";
+import { apiRoute } from "@versia/kit/api";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/instance/terms_of_service.ts

@@ -1,9 +1,9 @@
 import { TermsOfService as TermsOfServiceSchema } from "@versia/client/schemas";
+import { apiRoute } from "@versia/kit/api";
+import { markdownToHtml } from "@versia/kit/markdown";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute } from "@/api";
-import { markdownParse } from "~/classes/functions/status";
 
 export default apiRoute((app) =>
     app.get(
@@ -28,7 +28,7 @@ export default apiRoute((app) =>
             },
         }),
         async (context) => {
-            const content = await markdownParse(
+            const content = await markdownToHtml(
                 config.instance.tos_path?.content ??
                     "This instance has not provided any terms of service.",
             );

packages/api/routes/api/v1/markers/index.ts

@@ -5,6 +5,7 @@ import {
     Status as StatusSchema,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { db } from "@versia/kit/db";
 import { Markers } from "@versia/kit/tables";
 import { randomUUIDv7 } from "bun";
@@ -12,7 +13,6 @@ import { and, eq, type SQL } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 const MarkerResponseSchema = z.object({
     notifications: MarkerSchema.optional(),

packages/api/routes/api/v1/media/[id]/index.ts

@@ -3,12 +3,12 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Media } from "@versia/kit/db";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) => {
     app.get(

packages/api/routes/api/v1/media/index.ts

@@ -3,12 +3,12 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Media } from "@versia/kit/db";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/mutes/index.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/notifications/[id]/dismiss.ts

@@ -3,11 +3,11 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Notification } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/notifications/[id]/index.ts

@@ -3,11 +3,11 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Notification } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/notifications/clear/index.ts

@@ -1,7 +1,7 @@
 import { RolePermission } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/notifications/destroy_multiple/index.ts

@@ -1,9 +1,9 @@
 import { RolePermission } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, qsQuery } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, qsQuery } from "@/api";
 
 export default apiRoute((app) =>
     app.delete(

packages/api/routes/api/v1/notifications/index.ts

@@ -5,13 +5,13 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Notifications } from "@versia/kit/tables";
 import { and, eq, gt, gte, inArray, lt, not, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/profile/avatar.ts

@@ -1,8 +1,8 @@
 import { Account, RolePermission } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.delete(

packages/api/routes/api/v1/profile/header.ts

@@ -1,8 +1,8 @@
 import { Account, RolePermission } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.delete(

packages/api/routes/api/v1/push/subscription/index.delete.ts

@@ -1,10 +1,10 @@
 import { RolePermission } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { PushSubscription } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.delete(

packages/api/routes/api/v1/push/subscription/index.get.ts

@@ -3,10 +3,10 @@ import {
     WebPushSubscription as WebPushSubscriptionSchema,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth } from "@versia/kit/api";
 import { PushSubscription } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/push/subscription/index.post.ts

@@ -4,11 +4,11 @@ import {
     WebPushSubscription as WebPushSubscriptionSchema,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { PushSubscription } from "@versia/kit/db";
 import { randomUUIDv7 } from "bun";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
-import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/push/subscription/index.put.ts

@@ -4,10 +4,10 @@ import {
     WebPushSubscription as WebPushSubscriptionSchema,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { PushSubscription } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
-import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 
 export default apiRoute((app) =>
     app.put(

packages/api/routes/api/v1/roles/[id]/index.ts

@@ -1,10 +1,10 @@
 import { RolePermission, Role as RoleSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Role } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) => {
     app.get(

packages/api/routes/api/v1/roles/index.ts

@@ -1,11 +1,11 @@
 import { RolePermission, Role as RoleSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Role } from "@versia/kit/db";
 import { randomUUIDv7 } from "bun";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) => {
     app.get(

packages/api/routes/api/v1/statuses/[id]/context.ts

@@ -3,9 +3,9 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/statuses/[id]/favourite.ts

@@ -1,8 +1,8 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/statuses/[id]/favourited_by.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withNoteParam } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/statuses/[id]/index.ts

@@ -7,21 +7,21 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
-import { Emoji, Media } from "@versia/kit/db";
-import * as VersiaEntities from "@versia/sdk/entities";
-import { config } from "@versia-server/config";
-import { describeRoute } from "hono-openapi";
-import { resolver, validator } from "hono-openapi/zod";
-import { z } from "zod";
 import {
     apiRoute,
     auth,
     handleZodError,
     jsonOrForm,
     withNoteParam,
-} from "@/api";
+} from "@versia/kit/api";
+import { Emoji, Media } from "@versia/kit/db";
+import { parseMentionsFromText, versiaTextToHtml } from "@versia/kit/parsers";
+import * as VersiaEntities from "@versia/sdk/entities";
+import { config } from "@versia-server/config";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
+import { z } from "zod";
 import { sanitizedHtmlStrip } from "@/sanitization";
-import { contentToHtml, parseTextMentions } from "~/classes/functions/status";
 
 const schema = z
     .object({
@@ -256,7 +256,7 @@ export default apiRoute((app) => {
                 : undefined;
 
             const parsedMentions = statusText
-                ? await parseTextMentions(statusText)
+                ? await parseMentionsFromText(statusText)
                 : [];
 
             const parsedEmojis = statusText
@@ -267,7 +267,7 @@ export default apiRoute((app) => {
                 spoilerText: sanitizedSpoilerText,
                 sensitive,
                 content: content
-                    ? await contentToHtml(content, parsedMentions)
+                    ? await versiaTextToHtml(content, parsedMentions)
                     : undefined,
             });
 

packages/api/routes/api/v1/statuses/[id]/pin.ts

@@ -1,10 +1,10 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { db } from "@versia/kit/db";
 import { and, eq, type SQL } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/statuses/[id]/reactions/[name].ts

@@ -1,5 +1,6 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withNoteParam } from "@versia/kit/api";
 import { Emoji } from "@versia/kit/db";
 import { Emojis } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
@@ -9,7 +10,6 @@ import emojis from "unicode-emoji-json/data-ordered-emoji.json" with {
     type: "json",
 };
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withNoteParam } from "@/api";
 
 export default apiRoute((app) => {
     app.put(

packages/api/routes/api/v1/statuses/[id]/reactions/index.ts

@@ -3,10 +3,10 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/statuses/[id]/reblog.ts

@@ -1,9 +1,9 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, jsonOrForm, withNoteParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, jsonOrForm, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/statuses/[id]/reblogged_by.ts

@@ -3,13 +3,13 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, withNoteParam } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/statuses/[id]/source.ts

@@ -3,9 +3,9 @@ import {
     StatusSource as StatusSourceSchema,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/statuses/[id]/unfavourite.ts

@@ -1,8 +1,8 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/statuses/[id]/unpin.ts

@@ -1,8 +1,8 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/statuses/[id]/unreblog.ts

@@ -1,9 +1,9 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, withNoteParam } from "@versia/kit/api";
 import { Note } from "@versia/kit/db";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute, auth, withNoteParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v1/statuses/index.ts

@@ -7,16 +7,16 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { Emoji, Media, Note } from "@versia/kit/db";
+import { parseMentionsFromText, versiaTextToHtml } from "@versia/kit/parsers";
 import * as VersiaEntities from "@versia/sdk/entities";
 import { config } from "@versia-server/config";
 import { randomUUIDv7 } from "bun";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 import { sanitizedHtmlStrip } from "@/sanitization";
-import { contentToHtml, parseTextMentions } from "~/classes/functions/status";
 
 const schema = z
     .object({
@@ -220,7 +220,7 @@ export default apiRoute((app) =>
                 : undefined;
 
             const parsedMentions = status
-                ? await parseTextMentions(status)
+                ? await parseMentionsFromText(status)
                 : [];
 
             const parsedEmojis = status
@@ -232,7 +232,7 @@ export default apiRoute((app) =>
                 authorId: user.id,
                 visibility,
                 content: content
-                    ? await contentToHtml(content, parsedMentions)
+                    ? await versiaTextToHtml(content, parsedMentions)
                     : undefined,
                 sensitive,
                 spoilerText: sanitizedSpoilerText,

packages/api/routes/api/v1/timelines/home.ts

@@ -1,12 +1,12 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import { and, eq, gt, gte, inArray, lt, or, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v1/timelines/public.ts

@@ -4,13 +4,13 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Timeline } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import { and, eq, gt, gte, inArray, lt, or, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/api/v2/filters/[id]/index.ts

@@ -5,13 +5,13 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { db } from "@versia/kit/db";
 import { FilterKeywords, Filters } from "@versia/kit/tables";
 import { and, eq, inArray, type SQL } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 
 export default apiRoute((app) => {
     app.get(

packages/api/routes/api/v2/filters/index.ts

@@ -4,6 +4,7 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@versia/kit/api";
 import { db } from "@versia/kit/db";
 import { FilterKeywords, Filters } from "@versia/kit/tables";
 import { randomUUIDv7 } from "bun";
@@ -11,7 +12,6 @@ import { eq, type SQL } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 
 export default apiRoute((app) => {
     app.get(

packages/api/routes/api/v2/instance/index.ts

@@ -1,11 +1,11 @@
 import { Instance as InstanceSchema } from "@versia/client/schemas";
+import { apiRoute } from "@versia/kit/api";
 import { User } from "@versia/kit/db";
 import { Users } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
 import { and, eq, isNull } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
-import { apiRoute } from "@/api";
 import pkg from "~/package.json" with { type: "json" };
 
 export default apiRoute((app) =>

packages/api/routes/api/v2/media/index.ts

@@ -3,12 +3,12 @@ import {
     RolePermission,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { Media } from "@versia/kit/db";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/api/v2/search/index.ts

@@ -7,14 +7,15 @@ import {
     zBoolean,
 } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, auth, handleZodError } from "@versia/kit/api";
 import { db, Note, User } from "@versia/kit/db";
+import { parseUserAddress } from "@versia/kit/parsers";
 import { Instances, Notes, Users } from "@versia/kit/tables";
 import { config } from "@versia-server/config";
 import { and, eq, inArray, isNull, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, auth, handleZodError, parseUserAddress } from "@/api";
 import { searchManager } from "~/classes/search/search-manager";
 
 export default apiRoute((app) =>

packages/api/routes/inbox/index.ts

@@ -1,7 +1,7 @@
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 import { InboxJobType, inboxQueue } from "~/classes/queues/inbox";
 
 export default apiRoute((app) =>

packages/api/routes/likes/[uuid]/index.ts

@@ -1,5 +1,6 @@
 import { Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { Like, User } from "@versia/kit/db";
 import { Likes } from "@versia/kit/tables";
 import { LikeSchema } from "@versia/sdk/schemas";
@@ -8,7 +9,6 @@ import { and, eq, sql } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/media/[hash]/[name]/index.ts

@@ -1,9 +1,9 @@
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { file as bunFile } from "bun";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/media/proxy/[id].ts

@@ -1,11 +1,11 @@
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { config } from "@versia-server/config";
 import { proxy } from "hono/proxy";
 import type { ContentfulStatusCode, StatusCode } from "hono/utils/http-status";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/messaging/index.ts

@@ -1,7 +1,7 @@
 import { getLogger } from "@logtape/logtape";
+import { apiRoute } from "@versia/kit/api";
 import chalk from "chalk";
 import { describeRoute } from "hono-openapi";
-import { apiRoute } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

packages/api/routes/notes/[uuid]/index.ts

@@ -1,5 +1,6 @@
 import { Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { Note } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import { NoteSchema } from "@versia/sdk/schemas";
@@ -8,7 +9,6 @@ import { and, eq, inArray } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/notes/[uuid]/quotes.ts

@@ -1,5 +1,6 @@
 import { Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { db, Note } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import * as VersiaEntities from "@versia/sdk/entities";
@@ -9,7 +10,6 @@ import { and, eq, inArray } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/notes/[uuid]/replies.ts

@@ -1,5 +1,6 @@
 import { Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { db, Note } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import * as VersiaEntities from "@versia/sdk/entities";
@@ -9,7 +10,6 @@ import { and, eq, inArray } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/notes/[uuid]/shares.ts

@@ -1,5 +1,6 @@
 import { Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { db, Note } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import * as VersiaEntities from "@versia/sdk/entities";
@@ -9,7 +10,6 @@ import { and, eq, inArray } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/shares/[uuid]/index.ts

@@ -1,5 +1,6 @@
 import { Status as StatusSchema } from "@versia/client/schemas";
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { Note } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import { ShareSchema } from "@versia/sdk/schemas";
@@ -8,7 +9,6 @@ import { and, eq, inArray } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/users/[uuid]/inbox/index.ts

@@ -1,8 +1,8 @@
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 import { InboxJobType, inboxQueue } from "~/classes/queues/inbox";
 
 export default apiRoute((app) =>

packages/api/routes/users/[uuid]/index.ts

@@ -1,10 +1,10 @@
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { User } from "@versia/kit/db";
 import { UserSchema } from "@versia/sdk/schemas";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/users/[uuid]/outbox/index.ts

@@ -1,4 +1,5 @@
 import { ApiError } from "@versia/kit";
+import { apiRoute, handleZodError } from "@versia/kit/api";
 import { db, Note, User } from "@versia/kit/db";
 import { Notes } from "@versia/kit/tables";
 import * as VersiaEntities from "@versia/sdk/entities";
@@ -8,7 +9,6 @@ import { and, eq, inArray } from "drizzle-orm";
 import { describeRoute } from "hono-openapi";
 import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute, handleZodError } from "@/api";
 
 const NOTES_PER_PAGE = 20;
 

packages/api/routes/well-known/host-meta/index.ts

@@ -1,8 +1,8 @@
+import { apiRoute } from "@versia/kit/api";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute } from "@/api";
 
 export default apiRoute((app) =>
     app.get(

packages/api/routes/well-known/nodeinfo/2.0/index.ts

@@ -1,9 +1,9 @@
+import { apiRoute } from "@versia/kit/api";
 import { Note, User } from "@versia/kit/db";
 import { config } from "@versia-server/config";
 import { describeRoute } from "hono-openapi";
 import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
-import { apiRoute } from "@/api";
 import manifest from "~/package.json" with { type: "json" };
 
 export default apiRoute((app) =>