diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index d312a696..183c499e 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -13,4 +13,4 @@ const add = (a: number, b: number): number => a + b; We always write TypeScript with double quotes and four spaces for indentation, so when your responses include TypeScript code, please follow those conventions. -Our codebase uses Drizzle as an ORM, with custom abstractions in `classes/database/` for interacting with the database. The `@versia/kit/db` and `@versia/kit/tables` packages are aliases for these abstractions. +Our codebase uses Drizzle as an ORM, with custom abstractions in `classes/database/` for interacting with the database. The `@versia-server/kit/db` and `@versia-server/kit/tables` packages are aliases for these abstractions. diff --git a/bun.lock b/bun.lock index 05016a3b..baf69093 100644 --- a/bun.lock +++ b/bun.lock @@ -19,9 +19,9 @@ "@scalar/hono-api-reference": "catalog:", "@sentry/bun": "catalog:", "@versia-server/config": "workspace:*", + "@versia-server/kit": "workspace:*", "@versia-server/tests": "workspace:*", "@versia/client": "workspace:*", - "@versia/kit": "workspace:*", "@versia/sdk": "workspace:*", "altcha-lib": "catalog:", "blurhash": "catalog:", @@ -94,9 +94,9 @@ "@logtape/logtape": "catalog:", "@scalar/hono-api-reference": "catalog:", "@versia-server/config": "workspace:*", + "@versia-server/kit": "workspace:*", "@versia-server/tests": "workspace:*", "@versia/client": "workspace:*", - "@versia/kit": "workspace:*", "@versia/sdk": "workspace:*", "altcha-lib": "catalog:", "bun-bagel": "catalog:", @@ -146,7 +146,7 @@ }, }, "packages/plugin-kit": { - "name": "@versia/kit", + "name": "@versia-server/kit", "version": "0.0.0", "dependencies": { "@hackmd/markdown-it-task-lists": "catalog:", @@ -189,8 +189,8 @@ "version": "0.0.1", "dependencies": { "@versia-server/config": "workspace:*", + "@versia-server/kit": "workspace:*", "@versia/client": "workspace:*", - "@versia/kit": "workspace:*", "altcha-lib": "catalog:", "drizzle-orm": "catalog:", }, @@ -201,7 +201,7 @@ "dependencies": { "@logtape/logtape": "catalog:", "@versia-server/config": "workspace:*", - "@versia/kit": "workspace:*", + "@versia-server/kit": "workspace:*", "chalk": "catalog:", }, }, @@ -739,14 +739,14 @@ "@versia-server/config": ["@versia-server/config@workspace:packages/config"], + "@versia-server/kit": ["@versia-server/kit@workspace:packages/plugin-kit"], + "@versia-server/tests": ["@versia-server/tests@workspace:packages/tests"], "@versia-server/worker": ["@versia-server/worker@workspace:packages/worker"], "@versia/client": ["@versia/client@workspace:packages/client"], - "@versia/kit": ["@versia/kit@workspace:packages/plugin-kit"], - "@versia/sdk": ["@versia/sdk@workspace:packages/sdk"], "@vitejs/plugin-vue": ["@vitejs/plugin-vue@5.2.3", "", { "peerDependencies": { "vite": "^5.0.0 || ^6.0.0", "vue": "^3.2.25" } }, "sha512-IYSLEQj4LgZZuoVpdSUCw3dIynTWQgPlaRP6iAvMle4My0HdYwr5g5wQAfwOeHQBmYwEkqF70nRpSilr6PoUDg=="], diff --git a/classes/inbox/processor.ts b/classes/inbox/processor.ts index 7c366573..0657afca 100644 --- a/classes/inbox/processor.ts +++ b/classes/inbox/processor.ts @@ -1,5 +1,9 @@ import { getLogger, type Logger } from "@logtape/logtape"; -import { ApiError } from "@versia/kit"; +import { EntitySorter, type JSONObject } from "@versia/sdk"; +import { verify } from "@versia/sdk/crypto"; +import * as VersiaEntities from "@versia/sdk/entities"; +import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; import { type Instance, Like, @@ -7,12 +11,8 @@ import { Reaction, Relationship, User, -} from "@versia/kit/db"; -import { Likes, Notes } from "@versia/kit/tables"; -import { EntitySorter, type JSONObject } from "@versia/sdk"; -import { verify } from "@versia/sdk/crypto"; -import * as VersiaEntities from "@versia/sdk/entities"; -import { config } from "@versia-server/config"; +} from "@versia-server/kit/db"; +import { Likes, Notes } from "@versia-server/kit/tables"; import type { SocketAddress } from "bun"; import { Glob } from "bun"; import chalk from "chalk"; diff --git a/classes/plugin/loader.ts b/classes/plugin/loader.ts index 2985af70..da9f1bde 100644 --- a/classes/plugin/loader.ts +++ b/classes/plugin/loader.ts @@ -1,7 +1,7 @@ import { readdir } from "node:fs/promises"; import { getLogger, type Logger } from "@logtape/logtape"; -import { type Manifest, manifestSchema, Plugin } from "@versia/kit"; import { config } from "@versia-server/config"; +import { type Manifest, manifestSchema, Plugin } from "@versia-server/kit"; import { file, sleep } from "bun"; import chalk from "chalk"; import { parseJSON5, parseJSONC } from "confbox"; diff --git a/classes/queues/delivery.ts b/classes/queues/delivery.ts index 8fba83ba..bb01837b 100644 --- a/classes/queues/delivery.ts +++ b/classes/queues/delivery.ts @@ -1,8 +1,8 @@ -import { User } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; import type { JSONObject } from "@versia/sdk"; import * as VersiaEntities from "@versia/sdk/entities"; import { config } from "@versia-server/config"; +import { User } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; import { Queue, Worker } from "bullmq"; import chalk from "chalk"; diff --git a/classes/queues/fetch.ts b/classes/queues/fetch.ts index 3be2cd53..010beb39 100644 --- a/classes/queues/fetch.ts +++ b/classes/queues/fetch.ts @@ -1,7 +1,7 @@ -import { Instance } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; -import { Instances } from "@versia/kit/tables"; import { config } from "@versia-server/config"; +import { Instance } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; +import { Instances } from "@versia-server/kit/tables"; import { Queue, Worker } from "bullmq"; import { eq } from "drizzle-orm"; diff --git a/classes/queues/inbox.ts b/classes/queues/inbox.ts index ad1a833f..2ed73f02 100644 --- a/classes/queues/inbox.ts +++ b/classes/queues/inbox.ts @@ -1,9 +1,9 @@ import { getLogger } from "@logtape/logtape"; -import { ApiError } from "@versia/kit"; -import { Instance, User } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; import type { JSONObject } from "@versia/sdk"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { Instance, User } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; import { Queue, Worker } from "bullmq"; import type { SocketAddress } from "bun"; import { InboxProcessor } from "../inbox/processor.ts"; diff --git a/classes/queues/media.ts b/classes/queues/media.ts index 2e907231..432d069a 100644 --- a/classes/queues/media.ts +++ b/classes/queues/media.ts @@ -1,6 +1,6 @@ -import { Media } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; import { config } from "@versia-server/config"; +import { Media } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; import { Queue, Worker } from "bullmq"; import { calculateBlurhash } from "../media/preprocessors/blurhash.ts"; import { convertImage } from "../media/preprocessors/image-conversion.ts"; diff --git a/classes/queues/push.ts b/classes/queues/push.ts index c7e1a012..aaa86379 100644 --- a/classes/queues/push.ts +++ b/classes/queues/push.ts @@ -1,6 +1,6 @@ -import { Note, PushSubscription, Token, User } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; import { config } from "@versia-server/config"; +import { Note, PushSubscription, Token, User } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; import { Queue, Worker } from "bullmq"; import { sendNotification } from "web-push"; import { htmlToText } from "@/content_types.ts"; diff --git a/classes/queues/relationships.ts b/classes/queues/relationships.ts index d4a49775..0851db6d 100644 --- a/classes/queues/relationships.ts +++ b/classes/queues/relationships.ts @@ -1,6 +1,6 @@ -import { Relationship, User } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; import { config } from "@versia-server/config"; +import { Relationship, User } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; import { Queue, Worker } from "bullmq"; export enum RelationshipJobType { diff --git a/classes/search/search-manager.ts b/classes/search/search-manager.ts index ae5ef8b4..32415141 100644 --- a/classes/search/search-manager.ts +++ b/classes/search/search-manager.ts @@ -4,8 +4,8 @@ */ import { getLogger } from "@logtape/logtape"; -import { db, Note, User } from "@versia/kit/db"; import { config } from "@versia-server/config"; +import { db, Note, User } from "@versia-server/kit/db"; import type { SQL, ValueOrArray } from "drizzle-orm"; import { Ingest as SonicChannelIngest, diff --git a/cli/index.ts b/cli/index.ts index c744528b..2eb71b4a 100644 --- a/cli/index.ts +++ b/cli/index.ts @@ -3,7 +3,7 @@ import { friendlyErrorPlugin } from "@clerc/plugin-friendly-error"; import { helpPlugin } from "@clerc/plugin-help"; import { notFoundPlugin } from "@clerc/plugin-not-found"; import { versionPlugin } from "@clerc/plugin-version"; -import { setupDatabase } from "@versia/kit/db"; +import { setupDatabase } from "@versia-server/kit/db"; import { Clerc } from "clerc"; import { searchManager } from "~/classes/search/search-manager.ts"; import pkg from "~/package.json" with { type: "json" }; diff --git a/cli/instance/refetch.ts b/cli/instance/refetch.ts index 52ef8456..3e0e1096 100644 --- a/cli/instance/refetch.ts +++ b/cli/instance/refetch.ts @@ -1,5 +1,5 @@ -import { Instance } from "@versia/kit/db"; -import { Instances } from "@versia/kit/tables"; +import { Instance } from "@versia-server/kit/db"; +import { Instances } from "@versia-server/kit/tables"; import chalk from "chalk"; // @ts-expect-error - Root import is required or the Clec type definitions won't work // biome-ignore lint/correctness/noUnusedImports: Root import is required or the Clec type definitions won't work diff --git a/cli/user/create.ts b/cli/user/create.ts index d3ba13fc..3e2b56aa 100644 --- a/cli/user/create.ts +++ b/cli/user/create.ts @@ -1,6 +1,6 @@ -import { User } from "@versia/kit/db"; -import { Users } from "@versia/kit/tables"; import { config } from "@versia-server/config"; +import { User } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import chalk from "chalk"; // @ts-expect-error - Root import is required or the Clec type definitions won't work // biome-ignore lint/correctness/noUnusedImports: Root import is required or the Clec type definitions won't work diff --git a/cli/user/refetch.ts b/cli/user/refetch.ts index b84fb460..6535f4e2 100644 --- a/cli/user/refetch.ts +++ b/cli/user/refetch.ts @@ -1,4 +1,4 @@ -import { User } from "@versia/kit/db"; +import { User } from "@versia-server/kit/db"; import chalk from "chalk"; // @ts-expect-error - Root import is required or the Clec type definitions won't work // biome-ignore lint/correctness/noUnusedImports: Root import is required or the Clec type definitions won't work diff --git a/cli/user/token.ts b/cli/user/token.ts index 55e73237..6c88327c 100644 --- a/cli/user/token.ts +++ b/cli/user/token.ts @@ -1,4 +1,4 @@ -import { Token } from "@versia/kit/db"; +import { Token } from "@versia-server/kit/db"; import { randomUUIDv7 } from "bun"; import chalk from "chalk"; // @ts-expect-error - Root import is required or the Clec type definitions won't work diff --git a/cli/utils.ts b/cli/utils.ts index 8a22ce08..b75ffc06 100644 --- a/cli/utils.ts +++ b/cli/utils.ts @@ -1,6 +1,6 @@ -import { Instance, User } from "@versia/kit/db"; -import { parseUserAddress } from "@versia/kit/parsers"; -import { Users } from "@versia/kit/tables"; +import { Instance, User } from "@versia-server/kit/db"; +import { parseUserAddress } from "@versia-server/kit/parsers"; +import { Users } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; export const retrieveUser = async ( diff --git a/package.json b/package.json index 88c067a4..8ef79c0a 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "@scalar/hono-api-reference": "catalog:", "@sentry/bun": "catalog:", "@versia/client": "workspace:*", - "@versia/kit": "workspace:*", + "@versia-server/kit": "workspace:*", "@versia/sdk": "workspace:*", "@versia-server/tests": "workspace:*", "@versia-server/config": "workspace:*", diff --git a/packages/api/app.ts b/packages/api/app.ts index 3035344c..084b38f0 100644 --- a/packages/api/app.ts +++ b/packages/api/app.ts @@ -1,8 +1,8 @@ import { resolve } from "node:path"; import { getLogger } from "@logtape/logtape"; import { Scalar } from "@scalar/hono-api-reference"; -import { ApiError } from "@versia/kit"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; import chalk from "chalk"; import { Hono } from "hono"; import { serveStatic } from "hono/bun"; diff --git a/packages/api/middlewares/agent-bans.ts b/packages/api/middlewares/agent-bans.ts index ed0f9518..ee592ab5 100644 --- a/packages/api/middlewares/agent-bans.ts +++ b/packages/api/middlewares/agent-bans.ts @@ -1,5 +1,5 @@ -import { ApiError } from "@versia/kit"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; import { createMiddleware } from "hono/factory"; export const agentBans = createMiddleware(async (context, next) => { diff --git a/packages/api/middlewares/boundary-check.ts b/packages/api/middlewares/boundary-check.ts index cb324089..dd2a13f3 100644 --- a/packages/api/middlewares/boundary-check.ts +++ b/packages/api/middlewares/boundary-check.ts @@ -1,4 +1,4 @@ -import { ApiError } from "@versia/kit"; +import { ApiError } from "@versia-server/kit"; import { createMiddleware } from "hono/factory"; export const boundaryCheck = createMiddleware(async (context, next) => { diff --git a/packages/api/middlewares/ip-bans.ts b/packages/api/middlewares/ip-bans.ts index 0bf4ec90..91f2fa1d 100644 --- a/packages/api/middlewares/ip-bans.ts +++ b/packages/api/middlewares/ip-bans.ts @@ -1,6 +1,6 @@ import { getLogger } from "@logtape/logtape"; -import { ApiError } from "@versia/kit"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; import type { SocketAddress } from "bun"; import { createMiddleware } from "hono/factory"; import { matches } from "ip-matching"; diff --git a/packages/api/middlewares/rate-limit.ts b/packages/api/middlewares/rate-limit.ts index 49259beb..b14565b8 100644 --- a/packages/api/middlewares/rate-limit.ts +++ b/packages/api/middlewares/rate-limit.ts @@ -1,4 +1,4 @@ -import type { ApiError } from "@versia/kit"; +import type { ApiError } from "@versia-server/kit"; import { env } from "bun"; import type { MiddlewareHandler } from "hono"; import { rateLimiter } from "hono-rate-limiter"; diff --git a/packages/api/package.json b/packages/api/package.json index c15d6116..2742029e 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -44,7 +44,7 @@ "dependencies": { "@versia-server/config": "workspace:*", "@versia-server/tests": "workspace:*", - "@versia/kit": "workspace:*", + "@versia-server/kit": "workspace:*", "@versia/client": "workspace:*", "@versia/sdk": "workspace:*", "@logtape/logtape": "catalog:", diff --git a/packages/api/routes/api/auth/login/index.test.ts b/packages/api/routes/api/auth/login/index.test.ts index c4f8f886..1fe79f5d 100644 --- a/packages/api/routes/api/auth/login/index.test.ts +++ b/packages/api/routes/api/auth/login/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { Application } from "@versia/kit/db"; import { config } from "@versia-server/config"; +import { Application } from "@versia-server/kit/db"; import { fakeRequest, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; import { randomString } from "@/math"; diff --git a/packages/api/routes/api/auth/login/index.ts b/packages/api/routes/api/auth/login/index.ts index 4676492c..9940d08b 100644 --- a/packages/api/routes/api/auth/login/index.ts +++ b/packages/api/routes/api/auth/login/index.ts @@ -1,8 +1,8 @@ -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"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { Application, User } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { password as bunPassword } from "bun"; import { eq, or } from "drizzle-orm"; import type { Context } from "hono"; diff --git a/packages/api/routes/api/auth/redirect/index.ts b/packages/api/routes/api/auth/redirect/index.ts index be27327f..42fe1210 100644 --- a/packages/api/routes/api/auth/redirect/index.ts +++ b/packages/api/routes/api/auth/redirect/index.ts @@ -1,7 +1,7 @@ -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"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { db } from "@versia-server/kit/db"; +import { Applications, Tokens } from "@versia-server/kit/tables"; import { and, eq } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/auth/reset/index.test.ts b/packages/api/routes/api/auth/reset/index.test.ts index e36ebb34..2bb3ed5d 100644 --- a/packages/api/routes/api/auth/reset/index.test.ts +++ b/packages/api/routes/api/auth/reset/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { Application } from "@versia/kit/db"; import { config } from "@versia-server/config"; +import { Application } from "@versia-server/kit/db"; import { fakeRequest, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; import { randomString } from "@/math"; diff --git a/packages/api/routes/api/auth/reset/index.ts b/packages/api/routes/api/auth/reset/index.ts index cd1822da..da200b57 100644 --- a/packages/api/routes/api/auth/reset/index.ts +++ b/packages/api/routes/api/auth/reset/index.ts @@ -1,7 +1,7 @@ -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"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { password as bunPassword } from "bun"; import { eq } from "drizzle-orm"; import type { Context } from "hono"; diff --git a/packages/api/routes/api/v1/accounts/[id]/block.ts b/packages/api/routes/api/v1/accounts/[id]/block.ts index 9fae484d..27af0a61 100644 --- a/packages/api/routes/api/v1/accounts/[id]/block.ts +++ b/packages/api/routes/api/v1/accounts/[id]/block.ts @@ -2,9 +2,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/feed.atom.ts b/packages/api/routes/api/v1/accounts/[id]/feed.atom.ts index 144145a8..e814026e 100644 --- a/packages/api/routes/api/v1/accounts/[id]/feed.atom.ts +++ b/packages/api/routes/api/v1/accounts/[id]/feed.atom.ts @@ -1,6 +1,11 @@ import { RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/feed.rss.ts b/packages/api/routes/api/v1/accounts/[id]/feed.rss.ts index 159dc7bf..9baf5e66 100644 --- a/packages/api/routes/api/v1/accounts/[id]/feed.rss.ts +++ b/packages/api/routes/api/v1/accounts/[id]/feed.rss.ts @@ -1,6 +1,11 @@ import { RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, handleZodError, withUserParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/follow.ts b/packages/api/routes/api/v1/accounts/[id]/follow.ts index f18bbb53..34792bcc 100644 --- a/packages/api/routes/api/v1/accounts/[id]/follow.ts +++ b/packages/api/routes/api/v1/accounts/[id]/follow.ts @@ -3,9 +3,14 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/followers.ts b/packages/api/routes/api/v1/accounts/[id]/followers.ts index 42a37d2d..6b3d4dfd 100644 --- a/packages/api/routes/api/v1/accounts/[id]/followers.ts +++ b/packages/api/routes/api/v1/accounts/[id]/followers.ts @@ -2,10 +2,15 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/following.ts b/packages/api/routes/api/v1/accounts/[id]/following.ts index decdfa7b..a105aace 100644 --- a/packages/api/routes/api/v1/accounts/[id]/following.ts +++ b/packages/api/routes/api/v1/accounts/[id]/following.ts @@ -2,10 +2,15 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/index.ts b/packages/api/routes/api/v1/accounts/[id]/index.ts index d10f37d7..f9462e72 100644 --- a/packages/api/routes/api/v1/accounts/[id]/index.ts +++ b/packages/api/routes/api/v1/accounts/[id]/index.ts @@ -2,8 +2,8 @@ import { Account as AccountSchema, RolePermission, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, withUserParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/mute.ts b/packages/api/routes/api/v1/accounts/[id]/mute.ts index 6cb39a32..7e3cc236 100644 --- a/packages/api/routes/api/v1/accounts/[id]/mute.ts +++ b/packages/api/routes/api/v1/accounts/[id]/mute.ts @@ -2,9 +2,14 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/note.ts b/packages/api/routes/api/v1/accounts/[id]/note.ts index 221ef268..c635c9ce 100644 --- a/packages/api/routes/api/v1/accounts/[id]/note.ts +++ b/packages/api/routes/api/v1/accounts/[id]/note.ts @@ -2,9 +2,14 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/pin.ts b/packages/api/routes/api/v1/accounts/[id]/pin.ts index 6466f77b..81dba955 100644 --- a/packages/api/routes/api/v1/accounts/[id]/pin.ts +++ b/packages/api/routes/api/v1/accounts/[id]/pin.ts @@ -2,8 +2,8 @@ import { Relationship as RelationshipSchema, RolePermission, } from "@versia/client/schemas"; -import { apiRoute, auth, withUserParam } from "@versia/kit/api"; -import { Relationship } from "@versia/kit/db"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/refetch.ts b/packages/api/routes/api/v1/accounts/[id]/refetch.ts index 1d6d28c7..5ad4ea73 100644 --- a/packages/api/routes/api/v1/accounts/[id]/refetch.ts +++ b/packages/api/routes/api/v1/accounts/[id]/refetch.ts @@ -2,9 +2,9 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/remove_from_followers.ts b/packages/api/routes/api/v1/accounts/[id]/remove_from_followers.ts index 5d26e43a..3905c845 100644 --- a/packages/api/routes/api/v1/accounts/[id]/remove_from_followers.ts +++ b/packages/api/routes/api/v1/accounts/[id]/remove_from_followers.ts @@ -2,9 +2,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.test.ts b/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.test.ts index 0a1aa481..866b427a 100644 --- a/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.test.ts +++ b/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { RolePermission } from "@versia/client/schemas"; -import { Role } from "@versia/kit/db"; +import { Role } from "@versia-server/kit/db"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.ts b/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.ts index cb135e3e..24c6f10c 100644 --- a/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.ts +++ b/packages/api/routes/api/v1/accounts/[id]/roles/[role_id]/index.ts @@ -3,9 +3,14 @@ import { RolePermission, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; +import { Role } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/roles/index.test.ts b/packages/api/routes/api/v1/accounts/[id]/roles/index.test.ts index 83b195a8..d6a80a49 100644 --- a/packages/api/routes/api/v1/accounts/[id]/roles/index.test.ts +++ b/packages/api/routes/api/v1/accounts/[id]/roles/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { RolePermission } from "@versia/client/schemas"; -import { Role } from "@versia/kit/db"; +import { Role } from "@versia-server/kit/db"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/packages/api/routes/api/v1/accounts/[id]/roles/index.ts b/packages/api/routes/api/v1/accounts/[id]/roles/index.ts index ff61b24f..e120a0d8 100644 --- a/packages/api/routes/api/v1/accounts/[id]/roles/index.ts +++ b/packages/api/routes/api/v1/accounts/[id]/roles/index.ts @@ -1,6 +1,6 @@ import { Role as RoleSchema } from "@versia/client/schemas"; -import { apiRoute, auth, withUserParam } from "@versia/kit/api"; -import { Role } from "@versia/kit/db"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Role } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/statuses.ts b/packages/api/routes/api/v1/accounts/[id]/statuses.ts index 97ff8190..00dfc24b 100644 --- a/packages/api/routes/api/v1/accounts/[id]/statuses.ts +++ b/packages/api/routes/api/v1/accounts/[id]/statuses.ts @@ -3,10 +3,15 @@ import { Status as StatusSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withUserParam, +} from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/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"; diff --git a/packages/api/routes/api/v1/accounts/[id]/unblock.ts b/packages/api/routes/api/v1/accounts/[id]/unblock.ts index 0f0dc149..b05fdd98 100644 --- a/packages/api/routes/api/v1/accounts/[id]/unblock.ts +++ b/packages/api/routes/api/v1/accounts/[id]/unblock.ts @@ -2,9 +2,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/unfollow.ts b/packages/api/routes/api/v1/accounts/[id]/unfollow.ts index a089068f..df547d91 100644 --- a/packages/api/routes/api/v1/accounts/[id]/unfollow.ts +++ b/packages/api/routes/api/v1/accounts/[id]/unfollow.ts @@ -2,9 +2,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/unmute.ts b/packages/api/routes/api/v1/accounts/[id]/unmute.ts index 92dfa6c6..c6b09666 100644 --- a/packages/api/routes/api/v1/accounts/[id]/unmute.ts +++ b/packages/api/routes/api/v1/accounts/[id]/unmute.ts @@ -2,9 +2,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/[id]/unpin.ts b/packages/api/routes/api/v1/accounts/[id]/unpin.ts index 57713f7c..e704f3af 100644 --- a/packages/api/routes/api/v1/accounts/[id]/unpin.ts +++ b/packages/api/routes/api/v1/accounts/[id]/unpin.ts @@ -2,9 +2,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withUserParam } from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/familiar_followers/index.ts b/packages/api/routes/api/v1/accounts/familiar_followers/index.ts index 50d9f478..ee896513 100644 --- a/packages/api/routes/api/v1/accounts/familiar_followers/index.ts +++ b/packages/api/routes/api/v1/accounts/familiar_followers/index.ts @@ -3,10 +3,15 @@ import { FamiliarFollowers as FamiliarFollowersSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + qsQuery, +} from "@versia-server/kit/api"; +import { db, User } from "@versia-server/kit/db"; +import type { Users } from "@versia-server/kit/tables"; import { type InferSelectModel, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/index.post.test.ts b/packages/api/routes/api/v1/accounts/index.post.test.ts index 6a206cb7..db412fc3 100644 --- a/packages/api/routes/api/v1/accounts/index.post.test.ts +++ b/packages/api/routes/api/v1/accounts/index.post.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, test } from "bun:test"; -import { db } from "@versia/kit/db"; -import { Users } from "@versia/kit/tables"; +import { db } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { generateClient, getSolvedChallenge } from "@versia-server/tests"; import { eq } from "drizzle-orm"; import { randomString } from "@/math"; diff --git a/packages/api/routes/api/v1/accounts/index.ts b/packages/api/routes/api/v1/accounts/index.ts index 57908913..601277ca 100644 --- a/packages/api/routes/api/v1/accounts/index.ts +++ b/packages/api/routes/api/v1/accounts/index.ts @@ -1,15 +1,15 @@ import { Account as AccountSchema, zBoolean } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; +import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/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"; +} from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/lookup/index.ts b/packages/api/routes/api/v1/accounts/lookup/index.ts index b700bab9..fb24d756 100644 --- a/packages/api/routes/api/v1/accounts/lookup/index.ts +++ b/packages/api/routes/api/v1/accounts/lookup/index.ts @@ -2,12 +2,12 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Instance, User } from "@versia-server/kit/db"; +import { parseUserAddress } from "@versia-server/kit/parsers"; +import { Users } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/relationships/index.test.ts b/packages/api/routes/api/v1/accounts/relationships/index.test.ts index c44c43f7..3a6d8999 100644 --- a/packages/api/routes/api/v1/accounts/relationships/index.test.ts +++ b/packages/api/routes/api/v1/accounts/relationships/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { db } from "@versia/kit/db"; -import { Users } from "@versia/kit/tables"; +import { db } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { eq } from "drizzle-orm"; diff --git a/packages/api/routes/api/v1/accounts/relationships/index.ts b/packages/api/routes/api/v1/accounts/relationships/index.ts index 5ca8db7b..c7bbc394 100644 --- a/packages/api/routes/api/v1/accounts/relationships/index.ts +++ b/packages/api/routes/api/v1/accounts/relationships/index.ts @@ -4,9 +4,14 @@ import { RolePermission, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + qsQuery, +} from "@versia-server/kit/api"; +import { Relationship } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/accounts/search/index.ts b/packages/api/routes/api/v1/accounts/search/index.ts index a6b62863..caab1408 100644 --- a/packages/api/routes/api/v1/accounts/search/index.ts +++ b/packages/api/routes/api/v1/accounts/search/index.ts @@ -3,11 +3,11 @@ import { RolePermission, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; +import { parseUserAddress } from "@versia-server/kit/parsers"; +import { Users } from "@versia-server/kit/tables"; import { eq, ilike, not, or, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/update_credentials/index.ts b/packages/api/routes/api/v1/accounts/update_credentials/index.ts index d3e84961..ba4c8354 100644 --- a/packages/api/routes/api/v1/accounts/update_credentials/index.ts +++ b/packages/api/routes/api/v1/accounts/update_credentials/index.ts @@ -3,13 +3,18 @@ import { RolePermission, 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"; +import { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + jsonOrForm, +} from "@versia-server/kit/api"; +import { Emoji, Media, User } from "@versia-server/kit/db"; +import { versiaTextToHtml } from "@versia-server/kit/parsers"; +import { Users } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/accounts/verify_credentials/index.ts b/packages/api/routes/api/v1/accounts/verify_credentials/index.ts index 09a34c53..e53788e8 100644 --- a/packages/api/routes/api/v1/accounts/verify_credentials/index.ts +++ b/packages/api/routes/api/v1/accounts/verify_credentials/index.ts @@ -1,6 +1,6 @@ import { Account } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/apps/index.ts b/packages/api/routes/api/v1/apps/index.ts index 1193cbc1..e9994fea 100644 --- a/packages/api/routes/api/v1/apps/index.ts +++ b/packages/api/routes/api/v1/apps/index.ts @@ -2,9 +2,9 @@ import { Application as ApplicationSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError, jsonOrForm } from "@versia-server/kit/api"; +import { Application } from "@versia-server/kit/db"; import { randomUUIDv7 } from "bun"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/apps/verify_credentials/index.ts b/packages/api/routes/api/v1/apps/verify_credentials/index.ts index d21065f6..2ca405dd 100644 --- a/packages/api/routes/api/v1/apps/verify_credentials/index.ts +++ b/packages/api/routes/api/v1/apps/verify_credentials/index.ts @@ -2,9 +2,9 @@ import { Application as ApplicationSchema, RolePermission, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth } from "@versia/kit/api"; -import { Application } from "@versia/kit/db"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; +import { Application } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/blocks/index.ts b/packages/api/routes/api/v1/blocks/index.ts index 4cc21a5e..5772bfc4 100644 --- a/packages/api/routes/api/v1/blocks/index.ts +++ b/packages/api/routes/api/v1/blocks/index.ts @@ -2,10 +2,10 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/challenges/index.ts b/packages/api/routes/api/v1/challenges/index.ts index 3d739b64..22c663b6 100644 --- a/packages/api/routes/api/v1/challenges/index.ts +++ b/packages/api/routes/api/v1/challenges/index.ts @@ -1,7 +1,7 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { generateChallenge } from "@/challenges"; diff --git a/packages/api/routes/api/v1/custom_emojis/index.test.ts b/packages/api/routes/api/v1/custom_emojis/index.test.ts index f3961616..6fb13b1e 100644 --- a/packages/api/routes/api/v1/custom_emojis/index.test.ts +++ b/packages/api/routes/api/v1/custom_emojis/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { db } from "@versia/kit/db"; -import { Emojis } from "@versia/kit/tables"; +import { db } from "@versia-server/kit/db"; +import { Emojis } from "@versia-server/kit/tables"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { inArray } from "drizzle-orm"; diff --git a/packages/api/routes/api/v1/custom_emojis/index.ts b/packages/api/routes/api/v1/custom_emojis/index.ts index a037cfe4..de25ed14 100644 --- a/packages/api/routes/api/v1/custom_emojis/index.ts +++ b/packages/api/routes/api/v1/custom_emojis/index.ts @@ -2,10 +2,10 @@ import { CustomEmoji as CustomEmojiSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; +import { Emoji } from "@versia-server/kit/db"; +import { Emojis } from "@versia-server/kit/tables"; import { and, eq, isNull, or } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/emojis/[id]/index.test.ts b/packages/api/routes/api/v1/emojis/[id]/index.test.ts index 2c13cf07..4f289b17 100644 --- a/packages/api/routes/api/v1/emojis/[id]/index.test.ts +++ b/packages/api/routes/api/v1/emojis/[id]/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { db } from "@versia/kit/db"; -import { Emojis } from "@versia/kit/tables"; +import { db } from "@versia-server/kit/db"; +import { Emojis } from "@versia-server/kit/tables"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { inArray } from "drizzle-orm"; diff --git a/packages/api/routes/api/v1/emojis/[id]/index.ts b/packages/api/routes/api/v1/emojis/[id]/index.ts index 4c2c5661..19e01834 100644 --- a/packages/api/routes/api/v1/emojis/[id]/index.ts +++ b/packages/api/routes/api/v1/emojis/[id]/index.ts @@ -2,15 +2,15 @@ import { CustomEmoji as CustomEmojiSchema, RolePermission, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; +import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; import { apiRoute, auth, handleZodError, jsonOrForm, withEmojiParam, -} from "@versia/kit/api"; -import { config } from "@versia-server/config"; +} from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/emojis/index.test.ts b/packages/api/routes/api/v1/emojis/index.test.ts index 09aef0f4..317a2dd1 100644 --- a/packages/api/routes/api/v1/emojis/index.test.ts +++ b/packages/api/routes/api/v1/emojis/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { db } from "@versia/kit/db"; -import { Emojis } from "@versia/kit/tables"; +import { db } from "@versia-server/kit/db"; +import { Emojis } from "@versia-server/kit/tables"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { inArray } from "drizzle-orm"; import sharp from "sharp"; diff --git a/packages/api/routes/api/v1/emojis/index.ts b/packages/api/routes/api/v1/emojis/index.ts index 8098fd6e..ab589b23 100644 --- a/packages/api/routes/api/v1/emojis/index.ts +++ b/packages/api/routes/api/v1/emojis/index.ts @@ -2,11 +2,16 @@ import { CustomEmoji as CustomEmojiSchema, 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"; +import { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + jsonOrForm, +} from "@versia-server/kit/api"; +import { Emoji, Media } from "@versia-server/kit/db"; +import { Emojis } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { and, eq, isNull, or } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; diff --git a/packages/api/routes/api/v1/favourites/index.ts b/packages/api/routes/api/v1/favourites/index.ts index d25eb5b2..8676f219 100644 --- a/packages/api/routes/api/v1/favourites/index.ts +++ b/packages/api/routes/api/v1/favourites/index.ts @@ -1,8 +1,8 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/follow_requests/[account_id]/authorize.ts b/packages/api/routes/api/v1/follow_requests/[account_id]/authorize.ts index 6a06597f..112f1a78 100644 --- a/packages/api/routes/api/v1/follow_requests/[account_id]/authorize.ts +++ b/packages/api/routes/api/v1/follow_requests/[account_id]/authorize.ts @@ -3,9 +3,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Relationship, User } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/follow_requests/[account_id]/reject.ts b/packages/api/routes/api/v1/follow_requests/[account_id]/reject.ts index 1047e335..b7495fb6 100644 --- a/packages/api/routes/api/v1/follow_requests/[account_id]/reject.ts +++ b/packages/api/routes/api/v1/follow_requests/[account_id]/reject.ts @@ -3,9 +3,9 @@ import { Relationship as RelationshipSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Relationship, User } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/follow_requests/index.ts b/packages/api/routes/api/v1/follow_requests/index.ts index 5111e8e6..551c1391 100644 --- a/packages/api/routes/api/v1/follow_requests/index.ts +++ b/packages/api/routes/api/v1/follow_requests/index.ts @@ -2,10 +2,10 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/frontend/config/index.ts b/packages/api/routes/api/v1/frontend/config/index.ts index 8c757ff3..2050cebc 100644 --- a/packages/api/routes/api/v1/frontend/config/index.ts +++ b/packages/api/routes/api/v1/frontend/config/index.ts @@ -1,5 +1,5 @@ -import { apiRoute } from "@versia/kit/api"; import { config } from "@versia-server/config"; +import { apiRoute } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/instance/extended_description.ts b/packages/api/routes/api/v1/instance/extended_description.ts index 566468c5..e92f892c 100644 --- a/packages/api/routes/api/v1/instance/extended_description.ts +++ b/packages/api/routes/api/v1/instance/extended_description.ts @@ -1,7 +1,7 @@ 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 { apiRoute } from "@versia-server/kit/api"; +import { markdownToHtml } from "@versia-server/kit/markdown"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/instance/index.ts b/packages/api/routes/api/v1/instance/index.ts index c4d56aea..d3ebc916 100644 --- a/packages/api/routes/api/v1/instance/index.ts +++ b/packages/api/routes/api/v1/instance/index.ts @@ -1,9 +1,9 @@ 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 { apiRoute } from "@versia-server/kit/api"; +import { Instance, Note, User } from "@versia-server/kit/db"; +import { markdownToHtml } from "@versia-server/kit/markdown"; +import { Users } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/instance/privacy_policy.ts b/packages/api/routes/api/v1/instance/privacy_policy.ts index 8b29b1c2..b6f75187 100644 --- a/packages/api/routes/api/v1/instance/privacy_policy.ts +++ b/packages/api/routes/api/v1/instance/privacy_policy.ts @@ -1,7 +1,7 @@ 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 { apiRoute } from "@versia-server/kit/api"; +import { markdownToHtml } from "@versia-server/kit/markdown"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/instance/rules.ts b/packages/api/routes/api/v1/instance/rules.ts index 36662d67..ffabe8c2 100644 --- a/packages/api/routes/api/v1/instance/rules.ts +++ b/packages/api/routes/api/v1/instance/rules.ts @@ -1,6 +1,6 @@ import { Rule as RuleSchema } from "@versia/client/schemas"; -import { apiRoute } from "@versia/kit/api"; import { config } from "@versia-server/config"; +import { apiRoute } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/instance/terms_of_service.ts b/packages/api/routes/api/v1/instance/terms_of_service.ts index 9b35b1f8..99908634 100644 --- a/packages/api/routes/api/v1/instance/terms_of_service.ts +++ b/packages/api/routes/api/v1/instance/terms_of_service.ts @@ -1,7 +1,7 @@ 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 { apiRoute } from "@versia-server/kit/api"; +import { markdownToHtml } from "@versia-server/kit/markdown"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/markers/index.ts b/packages/api/routes/api/v1/markers/index.ts index 66744a4f..f5103290 100644 --- a/packages/api/routes/api/v1/markers/index.ts +++ b/packages/api/routes/api/v1/markers/index.ts @@ -4,10 +4,10 @@ import { RolePermission, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { db } from "@versia-server/kit/db"; +import { Markers } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { and, eq, type SQL } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; diff --git a/packages/api/routes/api/v1/media/[id]/index.ts b/packages/api/routes/api/v1/media/[id]/index.ts index f848fae8..7a26c5ec 100644 --- a/packages/api/routes/api/v1/media/[id]/index.ts +++ b/packages/api/routes/api/v1/media/[id]/index.ts @@ -2,10 +2,10 @@ import { Attachment as AttachmentSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Media } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/media/index.ts b/packages/api/routes/api/v1/media/index.ts index b9668cd9..2dcfded2 100644 --- a/packages/api/routes/api/v1/media/index.ts +++ b/packages/api/routes/api/v1/media/index.ts @@ -2,10 +2,10 @@ import { Attachment as AttachmentSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Media } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/mutes/index.ts b/packages/api/routes/api/v1/mutes/index.ts index 1bfddff4..595e9c87 100644 --- a/packages/api/routes/api/v1/mutes/index.ts +++ b/packages/api/routes/api/v1/mutes/index.ts @@ -2,10 +2,10 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/notifications/[id]/dismiss.ts b/packages/api/routes/api/v1/notifications/[id]/dismiss.ts index 29d8ba3f..1da2d616 100644 --- a/packages/api/routes/api/v1/notifications/[id]/dismiss.ts +++ b/packages/api/routes/api/v1/notifications/[id]/dismiss.ts @@ -2,9 +2,9 @@ import { Notification as NotificationSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Notification } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/notifications/[id]/index.ts b/packages/api/routes/api/v1/notifications/[id]/index.ts index 9e1dfac0..d1454b4a 100644 --- a/packages/api/routes/api/v1/notifications/[id]/index.ts +++ b/packages/api/routes/api/v1/notifications/[id]/index.ts @@ -2,9 +2,9 @@ import { Notification as NotificationSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Notification } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/notifications/clear/index.ts b/packages/api/routes/api/v1/notifications/clear/index.ts index 86565f27..65ac6e09 100644 --- a/packages/api/routes/api/v1/notifications/clear/index.ts +++ b/packages/api/routes/api/v1/notifications/clear/index.ts @@ -1,6 +1,6 @@ import { RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; export default apiRoute((app) => diff --git a/packages/api/routes/api/v1/notifications/destroy_multiple/index.ts b/packages/api/routes/api/v1/notifications/destroy_multiple/index.ts index ebec88c1..6f9995d4 100644 --- a/packages/api/routes/api/v1/notifications/destroy_multiple/index.ts +++ b/packages/api/routes/api/v1/notifications/destroy_multiple/index.ts @@ -1,6 +1,11 @@ import { RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, handleZodError, qsQuery } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + qsQuery, +} from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/notifications/index.ts b/packages/api/routes/api/v1/notifications/index.ts index ead91a0c..cb1664de 100644 --- a/packages/api/routes/api/v1/notifications/index.ts +++ b/packages/api/routes/api/v1/notifications/index.ts @@ -4,10 +4,10 @@ import { RolePermission, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Notifications } from "@versia-server/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"; diff --git a/packages/api/routes/api/v1/profile/avatar.ts b/packages/api/routes/api/v1/profile/avatar.ts index e4bd5273..2607485d 100644 --- a/packages/api/routes/api/v1/profile/avatar.ts +++ b/packages/api/routes/api/v1/profile/avatar.ts @@ -1,6 +1,6 @@ import { Account, RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/profile/header.ts b/packages/api/routes/api/v1/profile/header.ts index eba087cc..9be52065 100644 --- a/packages/api/routes/api/v1/profile/header.ts +++ b/packages/api/routes/api/v1/profile/header.ts @@ -1,6 +1,6 @@ import { Account, RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/push/subscription/index.delete.ts b/packages/api/routes/api/v1/push/subscription/index.delete.ts index 770b88ad..58744ebf 100644 --- a/packages/api/routes/api/v1/push/subscription/index.delete.ts +++ b/packages/api/routes/api/v1/push/subscription/index.delete.ts @@ -1,7 +1,7 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; +import { PushSubscription } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/push/subscription/index.get.ts b/packages/api/routes/api/v1/push/subscription/index.get.ts index 6347ba78..0ab18633 100644 --- a/packages/api/routes/api/v1/push/subscription/index.get.ts +++ b/packages/api/routes/api/v1/push/subscription/index.get.ts @@ -2,9 +2,9 @@ import { RolePermission, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth } from "@versia-server/kit/api"; +import { PushSubscription } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/push/subscription/index.post.ts b/packages/api/routes/api/v1/push/subscription/index.post.ts index f7088cd8..3b41af90 100644 --- a/packages/api/routes/api/v1/push/subscription/index.post.ts +++ b/packages/api/routes/api/v1/push/subscription/index.post.ts @@ -3,9 +3,14 @@ import { WebPushSubscriptionInput, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + jsonOrForm, +} from "@versia-server/kit/api"; +import { PushSubscription } from "@versia-server/kit/db"; import { randomUUIDv7 } from "bun"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/push/subscription/index.put.ts b/packages/api/routes/api/v1/push/subscription/index.put.ts index 8ff17611..e2735065 100644 --- a/packages/api/routes/api/v1/push/subscription/index.put.ts +++ b/packages/api/routes/api/v1/push/subscription/index.put.ts @@ -3,9 +3,14 @@ import { WebPushSubscriptionInput, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + jsonOrForm, +} from "@versia-server/kit/api"; +import { PushSubscription } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/push/subscription/index.test.ts b/packages/api/routes/api/v1/push/subscription/index.test.ts index 5ed27c46..fc78238f 100644 --- a/packages/api/routes/api/v1/push/subscription/index.test.ts +++ b/packages/api/routes/api/v1/push/subscription/index.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeEach, describe, expect, test } from "bun:test"; -import { PushSubscription } from "@versia/kit/db"; +import { PushSubscription } from "@versia-server/kit/db"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/packages/api/routes/api/v1/roles/[id]/index.test.ts b/packages/api/routes/api/v1/roles/[id]/index.test.ts index f17fed49..a5ff6794 100644 --- a/packages/api/routes/api/v1/roles/[id]/index.test.ts +++ b/packages/api/routes/api/v1/roles/[id]/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { RolePermission } from "@versia/client/schemas"; -import { Role } from "@versia/kit/db"; +import { Role } from "@versia-server/kit/db"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/packages/api/routes/api/v1/roles/[id]/index.ts b/packages/api/routes/api/v1/roles/[id]/index.ts index 20a15d43..92eb119e 100644 --- a/packages/api/routes/api/v1/roles/[id]/index.ts +++ b/packages/api/routes/api/v1/roles/[id]/index.ts @@ -1,7 +1,7 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Role } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/roles/index.test.ts b/packages/api/routes/api/v1/roles/index.test.ts index cffbb2b2..f42764fa 100644 --- a/packages/api/routes/api/v1/roles/index.test.ts +++ b/packages/api/routes/api/v1/roles/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { RolePermission } from "@versia/client/schemas"; -import { Role } from "@versia/kit/db"; import { config } from "@versia-server/config"; +import { Role } from "@versia-server/kit/db"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/packages/api/routes/api/v1/roles/index.ts b/packages/api/routes/api/v1/roles/index.ts index 764b377c..a93cadf5 100644 --- a/packages/api/routes/api/v1/roles/index.ts +++ b/packages/api/routes/api/v1/roles/index.ts @@ -1,7 +1,7 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Role } from "@versia-server/kit/db"; import { randomUUIDv7 } from "bun"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/context.ts b/packages/api/routes/api/v1/statuses/[id]/context.ts index 8c145e8b..cccac02f 100644 --- a/packages/api/routes/api/v1/statuses/[id]/context.ts +++ b/packages/api/routes/api/v1/statuses/[id]/context.ts @@ -2,8 +2,8 @@ import { Context as ContextSchema, RolePermission, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, withNoteParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/favourite.ts b/packages/api/routes/api/v1/statuses/[id]/favourite.ts index ce4e3e3e..64d555c5 100644 --- a/packages/api/routes/api/v1/statuses/[id]/favourite.ts +++ b/packages/api/routes/api/v1/statuses/[id]/favourite.ts @@ -1,6 +1,6 @@ import { RolePermission, Status as StatusSchema } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, withNoteParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/favourited_by.ts b/packages/api/routes/api/v1/statuses/[id]/favourited_by.ts index ea6e5329..beee6ff4 100644 --- a/packages/api/routes/api/v1/statuses/[id]/favourited_by.ts +++ b/packages/api/routes/api/v1/statuses/[id]/favourited_by.ts @@ -2,10 +2,15 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withNoteParam, +} from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/index.ts b/packages/api/routes/api/v1/statuses/[id]/index.ts index 4f3be06c..37f3278b 100644 --- a/packages/api/routes/api/v1/statuses/[id]/index.ts +++ b/packages/api/routes/api/v1/statuses/[id]/index.ts @@ -6,18 +6,21 @@ import { StatusSource as StatusSourceSchema, zBoolean, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; +import * as VersiaEntities from "@versia/sdk/entities"; +import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; import { apiRoute, auth, handleZodError, jsonOrForm, withNoteParam, -} 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"; +} from "@versia-server/kit/api"; +import { Emoji, Media } from "@versia-server/kit/db"; +import { + parseMentionsFromText, + versiaTextToHtml, +} from "@versia-server/kit/parsers"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/pin.ts b/packages/api/routes/api/v1/statuses/[id]/pin.ts index bdfc3919..345b3496 100644 --- a/packages/api/routes/api/v1/statuses/[id]/pin.ts +++ b/packages/api/routes/api/v1/statuses/[id]/pin.ts @@ -1,7 +1,7 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; +import { db } from "@versia-server/kit/db"; import { and, eq, type SQL } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/reactions/[name].test.ts b/packages/api/routes/api/v1/statuses/[id]/reactions/[name].test.ts index 24f2f457..ee644e28 100644 --- a/packages/api/routes/api/v1/statuses/[id]/reactions/[name].test.ts +++ b/packages/api/routes/api/v1/statuses/[id]/reactions/[name].test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; -import { Emoji, Media } from "@versia/kit/db"; +import { Emoji, Media } from "@versia-server/kit/db"; import { generateClient, getTestStatuses, diff --git a/packages/api/routes/api/v1/statuses/[id]/reactions/[name].ts b/packages/api/routes/api/v1/statuses/[id]/reactions/[name].ts index d6cd0bbd..810b6f02 100644 --- a/packages/api/routes/api/v1/statuses/[id]/reactions/[name].ts +++ b/packages/api/routes/api/v1/statuses/[id]/reactions/[name].ts @@ -1,8 +1,13 @@ 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withNoteParam, +} from "@versia-server/kit/api"; +import { Emoji } from "@versia-server/kit/db"; +import { Emojis } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/reactions/index.ts b/packages/api/routes/api/v1/statuses/[id]/reactions/index.ts index f5d22f5f..fe3b8060 100644 --- a/packages/api/routes/api/v1/statuses/[id]/reactions/index.ts +++ b/packages/api/routes/api/v1/statuses/[id]/reactions/index.ts @@ -2,8 +2,8 @@ import { NoteReactionWithAccounts, RolePermission, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, withNoteParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/reblog.ts b/packages/api/routes/api/v1/statuses/[id]/reblog.ts index ab3c8eef..97631350 100644 --- a/packages/api/routes/api/v1/statuses/[id]/reblog.ts +++ b/packages/api/routes/api/v1/statuses/[id]/reblog.ts @@ -1,6 +1,11 @@ import { RolePermission, Status as StatusSchema } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, jsonOrForm, withNoteParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + jsonOrForm, + withNoteParam, +} from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/reblogged_by.ts b/packages/api/routes/api/v1/statuses/[id]/reblogged_by.ts index 72b93475..4f9cbcbd 100644 --- a/packages/api/routes/api/v1/statuses/[id]/reblogged_by.ts +++ b/packages/api/routes/api/v1/statuses/[id]/reblogged_by.ts @@ -2,10 +2,15 @@ import { Account as AccountSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + withNoteParam, +} from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/source.ts b/packages/api/routes/api/v1/statuses/[id]/source.ts index dbc9df12..8e19789d 100644 --- a/packages/api/routes/api/v1/statuses/[id]/source.ts +++ b/packages/api/routes/api/v1/statuses/[id]/source.ts @@ -2,8 +2,8 @@ import { RolePermission, StatusSource as StatusSourceSchema, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, withNoteParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/unfavourite.ts b/packages/api/routes/api/v1/statuses/[id]/unfavourite.ts index f3f392ab..107203dc 100644 --- a/packages/api/routes/api/v1/statuses/[id]/unfavourite.ts +++ b/packages/api/routes/api/v1/statuses/[id]/unfavourite.ts @@ -1,6 +1,6 @@ import { RolePermission, Status as StatusSchema } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, withNoteParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/unpin.ts b/packages/api/routes/api/v1/statuses/[id]/unpin.ts index bff34009..af56409a 100644 --- a/packages/api/routes/api/v1/statuses/[id]/unpin.ts +++ b/packages/api/routes/api/v1/statuses/[id]/unpin.ts @@ -1,6 +1,6 @@ import { RolePermission, Status as StatusSchema } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { apiRoute, auth, withNoteParam } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/[id]/unreblog.ts b/packages/api/routes/api/v1/statuses/[id]/unreblog.ts index 3742c4e0..bfb7225a 100644 --- a/packages/api/routes/api/v1/statuses/[id]/unreblog.ts +++ b/packages/api/routes/api/v1/statuses/[id]/unreblog.ts @@ -1,7 +1,7 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, withNoteParam } from "@versia-server/kit/api"; +import { Note } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/statuses/index.test.ts b/packages/api/routes/api/v1/statuses/index.test.ts index 12934bb4..1cc3535f 100644 --- a/packages/api/routes/api/v1/statuses/index.test.ts +++ b/packages/api/routes/api/v1/statuses/index.test.ts @@ -1,8 +1,8 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import type { Status } from "@versia/client/schemas"; -import { db, Media } from "@versia/kit/db"; -import { Emojis } from "@versia/kit/tables"; import { config } from "@versia-server/config"; +import { db, Media } from "@versia-server/kit/db"; +import { Emojis } from "@versia-server/kit/tables"; import { generateClient, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; import { eq } from "drizzle-orm"; diff --git a/packages/api/routes/api/v1/statuses/index.ts b/packages/api/routes/api/v1/statuses/index.ts index 46ea2b39..cb822be1 100644 --- a/packages/api/routes/api/v1/statuses/index.ts +++ b/packages/api/routes/api/v1/statuses/index.ts @@ -6,12 +6,20 @@ import { StatusSource as StatusSourceSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + jsonOrForm, +} from "@versia-server/kit/api"; +import { Emoji, Media, Note } from "@versia-server/kit/db"; +import { + parseMentionsFromText, + versiaTextToHtml, +} from "@versia-server/kit/parsers"; import { randomUUIDv7 } from "bun"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v1/timelines/home.ts b/packages/api/routes/api/v1/timelines/home.ts index 0f1ebdb3..b580c534 100644 --- a/packages/api/routes/api/v1/timelines/home.ts +++ b/packages/api/routes/api/v1/timelines/home.ts @@ -1,8 +1,8 @@ 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/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"; diff --git a/packages/api/routes/api/v1/timelines/public.ts b/packages/api/routes/api/v1/timelines/public.ts index 52e1abf8..013028f1 100644 --- a/packages/api/routes/api/v1/timelines/public.ts +++ b/packages/api/routes/api/v1/timelines/public.ts @@ -3,10 +3,10 @@ import { Status as StatusSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Timeline } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/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"; diff --git a/packages/api/routes/api/v2/filters/[id]/index.ts b/packages/api/routes/api/v2/filters/[id]/index.ts index 61a06dd0..a43f0e05 100644 --- a/packages/api/routes/api/v2/filters/[id]/index.ts +++ b/packages/api/routes/api/v2/filters/[id]/index.ts @@ -4,10 +4,15 @@ import { RolePermission, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + jsonOrForm, +} from "@versia-server/kit/api"; +import { db } from "@versia-server/kit/db"; +import { FilterKeywords, Filters } from "@versia-server/kit/tables"; import { and, eq, inArray, type SQL } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v2/filters/index.ts b/packages/api/routes/api/v2/filters/index.ts index 0872839e..b55a02c4 100644 --- a/packages/api/routes/api/v2/filters/index.ts +++ b/packages/api/routes/api/v2/filters/index.ts @@ -3,10 +3,15 @@ import { Filter as FilterSchema, 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 { ApiError } from "@versia-server/kit"; +import { + apiRoute, + auth, + handleZodError, + jsonOrForm, +} from "@versia-server/kit/api"; +import { db } from "@versia-server/kit/db"; +import { FilterKeywords, Filters } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { eq, type SQL } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; diff --git a/packages/api/routes/api/v2/instance/index.ts b/packages/api/routes/api/v2/instance/index.ts index cd449aa6..c8271f98 100644 --- a/packages/api/routes/api/v2/instance/index.ts +++ b/packages/api/routes/api/v2/instance/index.ts @@ -1,8 +1,8 @@ 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 { apiRoute } from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/api/v2/media/index.ts b/packages/api/routes/api/v2/media/index.ts index 44a40731..0c658805 100644 --- a/packages/api/routes/api/v2/media/index.ts +++ b/packages/api/routes/api/v2/media/index.ts @@ -2,10 +2,10 @@ import { Attachment as AttachmentSchema, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { Media } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/api/v2/search/index.ts b/packages/api/routes/api/v2/search/index.ts index e5d08724..0d2656a2 100644 --- a/packages/api/routes/api/v2/search/index.ts +++ b/packages/api/routes/api/v2/search/index.ts @@ -6,12 +6,12 @@ import { userAddressRegex, 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 { ApiError } from "@versia-server/kit"; +import { apiRoute, auth, handleZodError } from "@versia-server/kit/api"; +import { db, Note, User } from "@versia-server/kit/db"; +import { parseUserAddress } from "@versia-server/kit/parsers"; +import { Instances, Notes, Users } from "@versia-server/kit/tables"; import { and, eq, inArray, isNull, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/inbox/index.test.ts b/packages/api/routes/inbox/index.test.ts index 51358c16..608c3c7e 100644 --- a/packages/api/routes/inbox/index.test.ts +++ b/packages/api/routes/inbox/index.test.ts @@ -1,9 +1,9 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { Instance, Note, Reaction, User } from "@versia/kit/db"; -import { Notes, Reactions, Users } from "@versia/kit/tables"; import { sign } from "@versia/sdk/crypto"; import * as VersiaEntities from "@versia/sdk/entities"; import { config } from "@versia-server/config"; +import { Instance, Note, Reaction, User } from "@versia-server/kit/db"; +import { Notes, Reactions, Users } from "@versia-server/kit/tables"; import { fakeRequest, generateClient, diff --git a/packages/api/routes/inbox/index.ts b/packages/api/routes/inbox/index.ts index 5ea50af6..1a35193c 100644 --- a/packages/api/routes/inbox/index.ts +++ b/packages/api/routes/inbox/index.ts @@ -1,4 +1,4 @@ -import { apiRoute, handleZodError } from "@versia/kit/api"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/likes/[uuid]/index.ts b/packages/api/routes/likes/[uuid]/index.ts index f0fe1c8e..1da1b344 100644 --- a/packages/api/routes/likes/[uuid]/index.ts +++ b/packages/api/routes/likes/[uuid]/index.ts @@ -1,10 +1,10 @@ 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"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { Like, User } from "@versia-server/kit/db"; +import { Likes } from "@versia-server/kit/tables"; import { and, eq, sql } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/media/[hash]/[name]/index.ts b/packages/api/routes/media/[hash]/[name]/index.ts index 21601bff..9581b2cb 100644 --- a/packages/api/routes/media/[hash]/[name]/index.ts +++ b/packages/api/routes/media/[hash]/[name]/index.ts @@ -1,5 +1,5 @@ -import { ApiError } from "@versia/kit"; -import { apiRoute, handleZodError } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; import { file as bunFile } from "bun"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/media/proxy/[id].ts b/packages/api/routes/media/proxy/[id].ts index c8c5a608..0757d040 100644 --- a/packages/api/routes/media/proxy/[id].ts +++ b/packages/api/routes/media/proxy/[id].ts @@ -1,6 +1,6 @@ -import { ApiError } from "@versia/kit"; -import { apiRoute, handleZodError } from "@versia/kit/api"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; import { proxy } from "hono/proxy"; import type { ContentfulStatusCode, StatusCode } from "hono/utils/http-status"; import { describeRoute } from "hono-openapi"; diff --git a/packages/api/routes/messaging/index.ts b/packages/api/routes/messaging/index.ts index 12d5c83a..81776514 100644 --- a/packages/api/routes/messaging/index.ts +++ b/packages/api/routes/messaging/index.ts @@ -1,5 +1,5 @@ import { getLogger } from "@logtape/logtape"; -import { apiRoute } from "@versia/kit/api"; +import { apiRoute } from "@versia-server/kit/api"; import chalk from "chalk"; import { describeRoute } from "hono-openapi"; diff --git a/packages/api/routes/notes/[uuid]/index.ts b/packages/api/routes/notes/[uuid]/index.ts index e7aaca0c..b6ba96da 100644 --- a/packages/api/routes/notes/[uuid]/index.ts +++ b/packages/api/routes/notes/[uuid]/index.ts @@ -1,10 +1,10 @@ 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"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { Note } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, eq, inArray } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/notes/[uuid]/quotes.ts b/packages/api/routes/notes/[uuid]/quotes.ts index 1b1a8291..e91c0bfb 100644 --- a/packages/api/routes/notes/[uuid]/quotes.ts +++ b/packages/api/routes/notes/[uuid]/quotes.ts @@ -1,11 +1,11 @@ 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"; import { URICollectionSchema } from "@versia/sdk/schemas"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { db, Note } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, eq, inArray } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/notes/[uuid]/replies.ts b/packages/api/routes/notes/[uuid]/replies.ts index 0f0ea187..8a755a0c 100644 --- a/packages/api/routes/notes/[uuid]/replies.ts +++ b/packages/api/routes/notes/[uuid]/replies.ts @@ -1,11 +1,11 @@ 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"; import { URICollectionSchema } from "@versia/sdk/schemas"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { db, Note } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, eq, inArray } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/notes/[uuid]/shares.ts b/packages/api/routes/notes/[uuid]/shares.ts index 43835670..72ed8362 100644 --- a/packages/api/routes/notes/[uuid]/shares.ts +++ b/packages/api/routes/notes/[uuid]/shares.ts @@ -1,11 +1,11 @@ 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"; import { URICollectionSchema } from "@versia/sdk/schemas"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { db, Note } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, eq, inArray } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/shares/[uuid]/index.ts b/packages/api/routes/shares/[uuid]/index.ts index 3795bb6f..9b2f6dc6 100644 --- a/packages/api/routes/shares/[uuid]/index.ts +++ b/packages/api/routes/shares/[uuid]/index.ts @@ -1,10 +1,10 @@ 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"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { Note } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, eq, inArray } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/users/[uuid]/inbox/index.ts b/packages/api/routes/users/[uuid]/inbox/index.ts index 68875797..7e60ee94 100644 --- a/packages/api/routes/users/[uuid]/inbox/index.ts +++ b/packages/api/routes/users/[uuid]/inbox/index.ts @@ -1,5 +1,5 @@ -import { ApiError } from "@versia/kit"; -import { apiRoute, handleZodError } from "@versia/kit/api"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/users/[uuid]/index.ts b/packages/api/routes/users/[uuid]/index.ts index c0786a93..1bf4bd12 100644 --- a/packages/api/routes/users/[uuid]/index.ts +++ b/packages/api/routes/users/[uuid]/index.ts @@ -1,7 +1,7 @@ -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 { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/users/[uuid]/outbox/index.ts b/packages/api/routes/users/[uuid]/outbox/index.ts index e2bbe6a2..a30d7603 100644 --- a/packages/api/routes/users/[uuid]/outbox/index.ts +++ b/packages/api/routes/users/[uuid]/outbox/index.ts @@ -1,10 +1,10 @@ -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"; import { CollectionSchema, NoteSchema } from "@versia/sdk/schemas"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { db, Note, User } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, eq, inArray } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/routes/well-known/host-meta/index.ts b/packages/api/routes/well-known/host-meta/index.ts index a287f5af..16837899 100644 --- a/packages/api/routes/well-known/host-meta/index.ts +++ b/packages/api/routes/well-known/host-meta/index.ts @@ -1,5 +1,5 @@ -import { apiRoute } from "@versia/kit/api"; import { config } from "@versia-server/config"; +import { apiRoute } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/well-known/nodeinfo/2.0/index.ts b/packages/api/routes/well-known/nodeinfo/2.0/index.ts index 863f8ec6..35c8ec43 100644 --- a/packages/api/routes/well-known/nodeinfo/2.0/index.ts +++ b/packages/api/routes/well-known/nodeinfo/2.0/index.ts @@ -1,6 +1,6 @@ -import { apiRoute } from "@versia/kit/api"; -import { Note, User } from "@versia/kit/db"; import { config } from "@versia-server/config"; +import { apiRoute } from "@versia-server/kit/api"; +import { Note, User } from "@versia-server/kit/db"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/well-known/nodeinfo/index.ts b/packages/api/routes/well-known/nodeinfo/index.ts index 1dc7d88f..b087a8a7 100644 --- a/packages/api/routes/well-known/nodeinfo/index.ts +++ b/packages/api/routes/well-known/nodeinfo/index.ts @@ -1,5 +1,5 @@ -import { apiRoute } from "@versia/kit/api"; import { config } from "@versia-server/config"; +import { apiRoute } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/well-known/openid-configuration/index.ts b/packages/api/routes/well-known/openid-configuration/index.ts index 4ac77f2e..fecf9854 100644 --- a/packages/api/routes/well-known/openid-configuration/index.ts +++ b/packages/api/routes/well-known/openid-configuration/index.ts @@ -1,5 +1,5 @@ -import { apiRoute } from "@versia/kit/api"; import { config } from "@versia-server/config"; +import { apiRoute } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { z } from "zod"; diff --git a/packages/api/routes/well-known/versia.ts b/packages/api/routes/well-known/versia.ts index c1f3a5b0..a694f484 100644 --- a/packages/api/routes/well-known/versia.ts +++ b/packages/api/routes/well-known/versia.ts @@ -1,8 +1,8 @@ -import { apiRoute } from "@versia/kit/api"; -import { User } from "@versia/kit/db"; -import { Users } from "@versia/kit/tables"; import { InstanceMetadataSchema } from "@versia/sdk/schemas"; import { config } from "@versia-server/config"; +import { apiRoute } from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; +import { Users } from "@versia-server/kit/tables"; import { asc } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; diff --git a/packages/api/routes/well-known/webfinger/index.ts b/packages/api/routes/well-known/webfinger/index.ts index 27b7e6da..b520a165 100644 --- a/packages/api/routes/well-known/webfinger/index.ts +++ b/packages/api/routes/well-known/webfinger/index.ts @@ -1,13 +1,13 @@ import { getLogger } from "@logtape/logtape"; -import { ApiError } from "@versia/kit"; -import { apiRoute, handleZodError } from "@versia/kit/api"; -import { User } from "@versia/kit/db"; -import { parseUserAddress } from "@versia/kit/parsers"; -import { uuid, webfingerMention } from "@versia/kit/regex"; -import { Users } from "@versia/kit/tables"; import { FederationRequester } from "@versia/sdk/http"; import { WebFingerSchema } from "@versia/sdk/schemas"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { apiRoute, handleZodError } from "@versia-server/kit/api"; +import { User } from "@versia-server/kit/db"; +import { parseUserAddress } from "@versia-server/kit/parsers"; +import { uuid, webfingerMention } from "@versia-server/kit/regex"; +import { Users } from "@versia-server/kit/tables"; import { and, eq, isNull } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/packages/api/setup.ts b/packages/api/setup.ts index 9647bc6f..99188e6d 100644 --- a/packages/api/setup.ts +++ b/packages/api/setup.ts @@ -1,7 +1,7 @@ import { getLogger } from "@logtape/logtape"; -import { Note, setupDatabase } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; import { config } from "@versia-server/config"; +import { Note, setupDatabase } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; import { configureLoggers } from "@/loggers"; import { searchManager } from "../../classes/search/search-manager.ts"; diff --git a/packages/plugin-kit/db/application.ts b/packages/plugin-kit/db/application.ts index 27bb0980..16d89779 100644 --- a/packages/plugin-kit/db/application.ts +++ b/packages/plugin-kit/db/application.ts @@ -2,8 +2,8 @@ import type { Application as ApplicationSchema, CredentialApplication, } from "@versia/client/schemas"; -import { db, Token } from "@versia/kit/db"; -import { Applications } from "@versia/kit/tables"; +import { db, Token } from "@versia-server/kit/db"; +import { Applications } from "@versia-server/kit/tables"; import { desc, eq, diff --git a/packages/plugin-kit/db/emoji.ts b/packages/plugin-kit/db/emoji.ts index c1298d32..c607c3a2 100644 --- a/packages/plugin-kit/db/emoji.ts +++ b/packages/plugin-kit/db/emoji.ts @@ -3,10 +3,10 @@ import { emojiWithColonsRegex, emojiWithIdentifiersRegex, } from "@versia/client/schemas"; -import { db, type Instance, Media } from "@versia/kit/db"; -import { Emojis, type Instances, type Medias } from "@versia/kit/tables"; import * as VersiaEntities from "@versia/sdk/entities"; import type { ImageContentFormatSchema } from "@versia/sdk/schemas"; +import { db, type Instance, Media } from "@versia-server/kit/db"; +import { Emojis, type Instances, type Medias } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { and, diff --git a/packages/plugin-kit/db/instance.ts b/packages/plugin-kit/db/instance.ts index 4806f2e2..897e3e5b 100644 --- a/packages/plugin-kit/db/instance.ts +++ b/packages/plugin-kit/db/instance.ts @@ -1,9 +1,9 @@ import { getLogger } from "@logtape/logtape"; -import { ApiError } from "@versia/kit"; -import { db } from "@versia/kit/db"; -import { Instances } from "@versia/kit/tables"; import * as VersiaEntities from "@versia/sdk/entities"; import { config } from "@versia-server/config"; +import { ApiError } from "@versia-server/kit"; +import { db } from "@versia-server/kit/db"; +import { Instances } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import chalk from "chalk"; import { diff --git a/packages/plugin-kit/db/like.ts b/packages/plugin-kit/db/like.ts index 9c5f5788..457aca37 100644 --- a/packages/plugin-kit/db/like.ts +++ b/packages/plugin-kit/db/like.ts @@ -1,12 +1,12 @@ -import { db } from "@versia/kit/db"; +import * as VersiaEntities from "@versia/sdk/entities"; +import { config } from "@versia-server/config"; +import { db } from "@versia-server/kit/db"; import { Likes, type Notes, Notifications, type Users, -} from "@versia/kit/tables"; -import * as VersiaEntities from "@versia/sdk/entities"; -import { config } from "@versia-server/config"; +} from "@versia-server/kit/tables"; import { and, desc, diff --git a/packages/plugin-kit/db/media.ts b/packages/plugin-kit/db/media.ts index 3485a0ef..3d24bf8c 100644 --- a/packages/plugin-kit/db/media.ts +++ b/packages/plugin-kit/db/media.ts @@ -1,8 +1,5 @@ import { join } from "node:path"; import type { Attachment as AttachmentSchema } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { db } from "@versia/kit/db"; -import { Medias } from "@versia/kit/tables"; import * as VersiaEntities from "@versia/sdk/entities"; import type { ContentFormatSchema, @@ -10,6 +7,9 @@ import type { } from "@versia/sdk/schemas"; import { config, ProxiableUrl } from "@versia-server/config"; import { MediaBackendType } from "@versia-server/config/schema"; +import { ApiError } from "@versia-server/kit"; +import { db } from "@versia-server/kit/db"; +import { Medias } from "@versia-server/kit/tables"; import { randomUUIDv7, S3Client, SHA256, write } from "bun"; import { desc, diff --git a/packages/plugin-kit/db/note.ts b/packages/plugin-kit/db/note.ts index df3e7f98..f392f1dc 100644 --- a/packages/plugin-kit/db/note.ts +++ b/packages/plugin-kit/db/note.ts @@ -1,7 +1,10 @@ import type { NoteReactionWithAccounts, Status } from "@versia/client/schemas"; -import { db, Instance, type Reaction } from "@versia/kit/db"; -import { versiaTextToHtml } from "@versia/kit/parsers"; -import { uuid } from "@versia/kit/regex"; +import * as VersiaEntities from "@versia/sdk/entities"; +import type { NonTextContentFormatSchema } from "@versia/sdk/schemas"; +import { config } from "@versia-server/config"; +import { db, Instance, type Reaction } from "@versia-server/kit/db"; +import { versiaTextToHtml } from "@versia-server/kit/parsers"; +import { uuid } from "@versia-server/kit/regex"; import { EmojiToNote, Likes, @@ -9,10 +12,7 @@ import { Notes, NoteToMentions, Users, -} from "@versia/kit/tables"; -import * as VersiaEntities from "@versia/sdk/entities"; -import type { NonTextContentFormatSchema } from "@versia/sdk/schemas"; -import { config } from "@versia-server/config"; +} from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { and, diff --git a/packages/plugin-kit/db/notification.ts b/packages/plugin-kit/db/notification.ts index 175f1fd8..4680ea3a 100644 --- a/packages/plugin-kit/db/notification.ts +++ b/packages/plugin-kit/db/notification.ts @@ -1,6 +1,6 @@ import type { Notification as NotificationSchema } from "@versia/client/schemas"; -import { db, Note, User } from "@versia/kit/db"; -import { Notifications } from "@versia/kit/tables"; +import { db, Note, User } from "@versia-server/kit/db"; +import { Notifications } from "@versia-server/kit/tables"; import { desc, eq, diff --git a/packages/plugin-kit/db/pushsubscription.ts b/packages/plugin-kit/db/pushsubscription.ts index 67460234..6faaa715 100644 --- a/packages/plugin-kit/db/pushsubscription.ts +++ b/packages/plugin-kit/db/pushsubscription.ts @@ -1,6 +1,6 @@ import type { WebPushSubscription as WebPushSubscriptionSchema } from "@versia/client/schemas"; -import { db, type Token, type User } from "@versia/kit/db"; -import { PushSubscriptions, Tokens } from "@versia/kit/tables"; +import { db, type Token, type User } from "@versia-server/kit/db"; +import { PushSubscriptions, Tokens } from "@versia-server/kit/tables"; import { desc, eq, diff --git a/packages/plugin-kit/db/reaction.ts b/packages/plugin-kit/db/reaction.ts index fbb9363b..c6b051d0 100644 --- a/packages/plugin-kit/db/reaction.ts +++ b/packages/plugin-kit/db/reaction.ts @@ -1,7 +1,7 @@ -import { db, Emoji, Instance, type Note, User } from "@versia/kit/db"; -import { type Notes, Reactions, type Users } from "@versia/kit/tables"; import * as VersiaEntities from "@versia/sdk/entities"; import { config } from "@versia-server/config"; +import { db, Emoji, Instance, type Note, User } from "@versia-server/kit/db"; +import { type Notes, Reactions, type Users } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { and, diff --git a/packages/plugin-kit/db/relationship.ts b/packages/plugin-kit/db/relationship.ts index 107c1aec..4c27618d 100644 --- a/packages/plugin-kit/db/relationship.ts +++ b/packages/plugin-kit/db/relationship.ts @@ -1,6 +1,6 @@ import type { Relationship as RelationshipSchema } from "@versia/client/schemas"; -import { db } from "@versia/kit/db"; -import { Relationships, Users } from "@versia/kit/tables"; +import { db } from "@versia-server/kit/db"; +import { Relationships, Users } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { and, diff --git a/packages/plugin-kit/db/role.ts b/packages/plugin-kit/db/role.ts index bd9089ab..333c6ec0 100644 --- a/packages/plugin-kit/db/role.ts +++ b/packages/plugin-kit/db/role.ts @@ -2,9 +2,9 @@ import type { RolePermission, Role as RoleSchema, } from "@versia/client/schemas"; -import { db } from "@versia/kit/db"; -import { Roles, RoleToUsers } from "@versia/kit/tables"; import { config, ProxiableUrl } from "@versia-server/config"; +import { db } from "@versia-server/kit/db"; +import { Roles, RoleToUsers } from "@versia-server/kit/tables"; import { and, desc, diff --git a/packages/plugin-kit/db/timeline.ts b/packages/plugin-kit/db/timeline.ts index e446afb3..e059163b 100644 --- a/packages/plugin-kit/db/timeline.ts +++ b/packages/plugin-kit/db/timeline.ts @@ -1,5 +1,5 @@ -import { Notes, Notifications, Users } from "@versia/kit/tables"; import { config } from "@versia-server/config"; +import { Notes, Notifications, Users } from "@versia-server/kit/tables"; import { gt, type SQL } from "drizzle-orm"; import { Note } from "./note.ts"; import { Notification } from "./notification.ts"; diff --git a/packages/plugin-kit/db/token.ts b/packages/plugin-kit/db/token.ts index a2113811..c54258fc 100644 --- a/packages/plugin-kit/db/token.ts +++ b/packages/plugin-kit/db/token.ts @@ -1,6 +1,6 @@ import type { Token as TokenSchema } from "@versia/client/schemas"; -import { type Application, db, User } from "@versia/kit/db"; -import { Tokens } from "@versia/kit/tables"; +import { type Application, db, User } from "@versia-server/kit/db"; +import { Tokens } from "@versia-server/kit/tables"; import { desc, eq, diff --git a/packages/plugin-kit/db/user.ts b/packages/plugin-kit/db/user.ts index 3058765e..9ff50fdc 100644 --- a/packages/plugin-kit/db/user.ts +++ b/packages/plugin-kit/db/user.ts @@ -6,14 +6,19 @@ import type { Source, Status as StatusSchema, } from "@versia/client/schemas"; +import { sign } from "@versia/sdk/crypto"; +import * as VersiaEntities from "@versia/sdk/entities"; +import { FederationRequester } from "@versia/sdk/http"; +import type { ImageContentFormatSchema } from "@versia/sdk/schemas"; +import { config, ProxiableUrl } from "@versia-server/config"; import { db, Media, Notification, PushSubscription, Reaction, -} from "@versia/kit/db"; -import { uuid } from "@versia/kit/regex"; +} from "@versia-server/kit/db"; +import { uuid } from "@versia-server/kit/regex"; import { EmojiToUser, Likes, @@ -23,12 +28,7 @@ import { Relationships, Users, UserToPinnedNotes, -} from "@versia/kit/tables"; -import { sign } from "@versia/sdk/crypto"; -import * as VersiaEntities from "@versia/sdk/entities"; -import { FederationRequester } from "@versia/sdk/http"; -import type { ImageContentFormatSchema } from "@versia/sdk/schemas"; -import { config, ProxiableUrl } from "@versia-server/config"; +} from "@versia-server/kit/tables"; import { password as bunPassword, randomUUIDv7 } from "bun"; import chalk from "chalk"; import { diff --git a/packages/plugin-kit/package.json b/packages/plugin-kit/package.json index 202c8710..0ee45f8b 100644 --- a/packages/plugin-kit/package.json +++ b/packages/plugin-kit/package.json @@ -1,5 +1,5 @@ { - "name": "@versia/kit", + "name": "@versia-server/kit", "module": "index.ts", "type": "module", "version": "0.0.0", diff --git a/packages/tests/index.ts b/packages/tests/index.ts index 432c5798..9eb663ba 100644 --- a/packages/tests/index.ts +++ b/packages/tests/index.ts @@ -1,8 +1,8 @@ import { mock } from "bun:test"; import { Client as VersiaClient } from "@versia/client"; -import { db, Note, setupDatabase, Token, User } from "@versia/kit/db"; -import { Notes, Users } from "@versia/kit/tables"; import { config } from "@versia-server/config"; +import { db, Note, setupDatabase, Token, User } from "@versia-server/kit/db"; +import { Notes, Users } from "@versia-server/kit/tables"; import { solveChallenge } from "altcha-lib"; import { env, randomUUIDv7 } from "bun"; import { asc, type InferSelectModel, inArray, like } from "drizzle-orm"; diff --git a/packages/tests/package.json b/packages/tests/package.json index cc92261c..b49f0747 100644 --- a/packages/tests/package.json +++ b/packages/tests/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@versia-server/config": "workspace:*", - "@versia/kit": "workspace:*", + "@versia-server/kit": "workspace:*", "@versia/client": "workspace:*", "altcha-lib": "catalog:", "drizzle-orm": "catalog:" diff --git a/packages/tests/setup.ts b/packages/tests/setup.ts index 01c9ffcd..733232fd 100644 --- a/packages/tests/setup.ts +++ b/packages/tests/setup.ts @@ -1,4 +1,4 @@ -import { setupDatabase } from "@versia/kit/db"; +import { setupDatabase } from "@versia-server/kit/db"; import { deleteOldTestUsers } from "./index.ts"; await setupDatabase(); diff --git a/packages/worker/package.json b/packages/worker/package.json index 9fb7f96e..51a73d6a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@versia-server/config": "workspace:*", - "@versia/kit": "workspace:*", + "@versia-server/kit": "workspace:*", "chalk": "catalog:", "@logtape/logtape": "catalog:" } diff --git a/packages/worker/setup.ts b/packages/worker/setup.ts index 526a4892..bd2471fb 100644 --- a/packages/worker/setup.ts +++ b/packages/worker/setup.ts @@ -1,7 +1,7 @@ import { getLogger } from "@logtape/logtape"; -import { Note, setupDatabase } from "@versia/kit/db"; -import { connection } from "@versia/kit/redis"; import { config } from "@versia-server/config"; +import { Note, setupDatabase } from "@versia-server/kit/db"; +import { connection } from "@versia-server/kit/redis"; import chalk from "chalk"; import { configureLoggers } from "@/loggers"; import { searchManager } from "../../classes/search/search-manager.ts"; diff --git a/plugins/openid/index.ts b/plugins/openid/index.ts index 1d92549a..c06fc361 100644 --- a/plugins/openid/index.ts +++ b/plugins/openid/index.ts @@ -1,7 +1,7 @@ import { RolePermission } from "@versia/client/schemas"; -import { ApiError, Hooks, Plugin } from "@versia/kit"; -import { User } from "@versia/kit/db"; import { keyPair, sensitiveString, url } from "@versia-server/config/schema"; +import { ApiError, Hooks, Plugin } from "@versia-server/kit"; +import { User } from "@versia-server/kit/db"; import { getCookie } from "hono/cookie"; import { jwtVerify } from "jose"; import { JOSEError, JWTExpired } from "jose/errors"; diff --git a/plugins/openid/routes/authorize.test.ts b/plugins/openid/routes/authorize.test.ts index 4d30bae4..943ee586 100644 --- a/plugins/openid/routes/authorize.test.ts +++ b/plugins/openid/routes/authorize.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { RolePermission } from "@versia/client/schemas"; -import { Application } from "@versia/kit/db"; import { config } from "@versia-server/config"; +import { Application } from "@versia-server/kit/db"; import { fakeRequest, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; import { SignJWT } from "jose"; diff --git a/plugins/openid/routes/authorize.ts b/plugins/openid/routes/authorize.ts index e554fc21..2db1df2f 100644 --- a/plugins/openid/routes/authorize.ts +++ b/plugins/openid/routes/authorize.ts @@ -1,6 +1,6 @@ import { RolePermission } from "@versia/client/schemas"; -import { auth, handleZodError, jsonOrForm } from "@versia/kit/api"; -import { Application, Token, User } from "@versia/kit/db"; +import { auth, handleZodError, jsonOrForm } from "@versia-server/kit/api"; +import { Application, Token, User } from "@versia-server/kit/db"; import { randomUUIDv7 } from "bun"; import { describeRoute } from "hono-openapi"; import { validator } from "hono-openapi/zod"; diff --git a/plugins/openid/routes/jwks.test.ts b/plugins/openid/routes/jwks.test.ts index 3d05b3a3..2d97acf5 100644 --- a/plugins/openid/routes/jwks.test.ts +++ b/plugins/openid/routes/jwks.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { Application } from "@versia/kit/db"; +import { Application } from "@versia-server/kit/db"; import { fakeRequest } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/plugins/openid/routes/jwks.ts b/plugins/openid/routes/jwks.ts index 66b627b4..061dfbac 100644 --- a/plugins/openid/routes/jwks.ts +++ b/plugins/openid/routes/jwks.ts @@ -1,4 +1,4 @@ -import { auth } from "@versia/kit/api"; +import { auth } from "@versia-server/kit/api"; import { describeRoute } from "hono-openapi"; import { resolver } from "hono-openapi/zod"; import { exportJWK } from "jose"; diff --git a/plugins/openid/routes/oauth/callback.ts b/plugins/openid/routes/oauth/callback.ts index 182db3eb..ec2f771b 100644 --- a/plugins/openid/routes/oauth/callback.ts +++ b/plugins/openid/routes/oauth/callback.ts @@ -2,10 +2,10 @@ import { Account as AccountSchema, RolePermission, } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { handleZodError } from "@versia/kit/api"; -import { db, Media, Token, User } from "@versia/kit/db"; -import { OpenIdAccounts, Users } from "@versia/kit/tables"; +import { ApiError } from "@versia-server/kit"; +import { handleZodError } from "@versia-server/kit/api"; +import { db, Media, Token, User } from "@versia-server/kit/db"; +import { OpenIdAccounts, Users } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { and, eq, isNull, type SQL } from "drizzle-orm"; import { setCookie } from "hono/cookie"; diff --git a/plugins/openid/routes/oauth/revoke.test.ts b/plugins/openid/routes/oauth/revoke.test.ts index c5454c25..4d469b94 100644 --- a/plugins/openid/routes/oauth/revoke.test.ts +++ b/plugins/openid/routes/oauth/revoke.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { Application, Token } from "@versia/kit/db"; +import { Application, Token } from "@versia-server/kit/db"; import { fakeRequest, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/plugins/openid/routes/oauth/revoke.ts b/plugins/openid/routes/oauth/revoke.ts index 979d6593..252c88f5 100644 --- a/plugins/openid/routes/oauth/revoke.ts +++ b/plugins/openid/routes/oauth/revoke.ts @@ -1,6 +1,6 @@ -import { handleZodError, jsonOrForm } from "@versia/kit/api"; -import { db, Token } from "@versia/kit/db"; -import { Tokens } from "@versia/kit/tables"; +import { handleZodError, jsonOrForm } from "@versia-server/kit/api"; +import { db, Token } from "@versia-server/kit/db"; +import { Tokens } from "@versia-server/kit/tables"; import { and, eq } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/plugins/openid/routes/oauth/sso.ts b/plugins/openid/routes/oauth/sso.ts index 847d42f4..57c4c2d1 100644 --- a/plugins/openid/routes/oauth/sso.ts +++ b/plugins/openid/routes/oauth/sso.ts @@ -1,6 +1,6 @@ -import { handleZodError } from "@versia/kit/api"; -import { Application, db } from "@versia/kit/db"; -import { OpenIdLoginFlows } from "@versia/kit/tables"; +import { handleZodError } from "@versia-server/kit/api"; +import { Application, db } from "@versia-server/kit/db"; +import { OpenIdLoginFlows } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { describeRoute } from "hono-openapi"; import { validator } from "hono-openapi/zod"; diff --git a/plugins/openid/routes/oauth/token.test.ts b/plugins/openid/routes/oauth/token.test.ts index dbf57f20..cb53156e 100644 --- a/plugins/openid/routes/oauth/token.test.ts +++ b/plugins/openid/routes/oauth/token.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, test } from "bun:test"; -import { Application, Token } from "@versia/kit/db"; +import { Application, Token } from "@versia-server/kit/db"; import { fakeRequest, getTestUsers } from "@versia-server/tests"; import { randomUUIDv7 } from "bun"; diff --git a/plugins/openid/routes/oauth/token.ts b/plugins/openid/routes/oauth/token.ts index dfaf0b2f..21634dc5 100644 --- a/plugins/openid/routes/oauth/token.ts +++ b/plugins/openid/routes/oauth/token.ts @@ -1,6 +1,6 @@ -import { handleZodError, jsonOrForm } from "@versia/kit/api"; -import { Application, Token } from "@versia/kit/db"; -import { Tokens } from "@versia/kit/tables"; +import { handleZodError, jsonOrForm } from "@versia-server/kit/api"; +import { Application, Token } from "@versia-server/kit/db"; +import { Tokens } from "@versia-server/kit/tables"; import { and, eq } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/plugins/openid/routes/sso/:id/index.ts b/plugins/openid/routes/sso/:id/index.ts index 5327c0c6..5419c557 100644 --- a/plugins/openid/routes/sso/:id/index.ts +++ b/plugins/openid/routes/sso/:id/index.ts @@ -1,8 +1,8 @@ import { RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { auth, handleZodError } from "@versia/kit/api"; -import { db } from "@versia/kit/db"; -import { OpenIdAccounts } from "@versia/kit/tables"; +import { ApiError } from "@versia-server/kit"; +import { auth, handleZodError } from "@versia-server/kit/api"; +import { db } from "@versia-server/kit/db"; +import { OpenIdAccounts } from "@versia-server/kit/tables"; import { and, eq, type SQL } from "drizzle-orm"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/plugins/openid/routes/sso/index.ts b/plugins/openid/routes/sso/index.ts index b6ab5585..f678eb53 100644 --- a/plugins/openid/routes/sso/index.ts +++ b/plugins/openid/routes/sso/index.ts @@ -1,8 +1,8 @@ import { RolePermission } from "@versia/client/schemas"; -import { ApiError } from "@versia/kit"; -import { auth, handleZodError } from "@versia/kit/api"; -import { Application, db } from "@versia/kit/db"; -import { OpenIdLoginFlows } from "@versia/kit/tables"; +import { ApiError } from "@versia-server/kit"; +import { auth, handleZodError } from "@versia-server/kit/api"; +import { Application, db } from "@versia-server/kit/db"; +import { OpenIdLoginFlows } from "@versia-server/kit/tables"; import { randomUUIDv7 } from "bun"; import { describeRoute } from "hono-openapi"; import { resolver, validator } from "hono-openapi/zod"; diff --git a/plugins/openid/utils.ts b/plugins/openid/utils.ts index 82d8b7ac..afaf3e50 100644 --- a/plugins/openid/utils.ts +++ b/plugins/openid/utils.ts @@ -1,5 +1,5 @@ -import { type Application, db } from "@versia/kit/db"; -import type { OpenIdLoginFlows } from "@versia/kit/tables"; +import { type Application, db } from "@versia-server/kit/db"; +import type { OpenIdLoginFlows } from "@versia-server/kit/tables"; import { eq, type InferSelectModel, type SQL } from "drizzle-orm"; import { type AuthorizationResponseError, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cdd81082..af786ce5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -278,15 +278,15 @@ importers: '@versia-server/config': specifier: workspace:* version: link:packages/config + '@versia-server/kit': + specifier: workspace:* + version: link:packages/plugin-kit '@versia-server/tests': specifier: workspace:* version: link:packages/tests '@versia/client': specifier: workspace:* version: link:packages/client - '@versia/kit': - specifier: workspace:* - version: link:packages/plugin-kit '@versia/sdk': specifier: workspace:* version: link:packages/sdk @@ -483,15 +483,15 @@ importers: '@versia-server/config': specifier: workspace:* version: link:../config + '@versia-server/kit': + specifier: workspace:* + version: link:../plugin-kit '@versia-server/tests': specifier: workspace:* version: link:../tests '@versia/client': specifier: workspace:* version: link:../client - '@versia/kit': - specifier: workspace:* - version: link:../plugin-kit '@versia/sdk': specifier: workspace:* version: link:../sdk @@ -693,12 +693,12 @@ importers: '@versia-server/config': specifier: workspace:* version: link:../config + '@versia-server/kit': + specifier: workspace:* + version: link:../plugin-kit '@versia/client': specifier: workspace:* version: link:../client - '@versia/kit': - specifier: workspace:* - version: link:../plugin-kit altcha-lib: specifier: 'catalog:' version: 1.3.0 @@ -714,7 +714,7 @@ importers: '@versia-server/config': specifier: workspace:* version: link:../config - '@versia/kit': + '@versia-server/kit': specifier: workspace:* version: link:../plugin-kit chalk: diff --git a/types/api.ts b/types/api.ts index 553e6831..56a1bfba 100644 --- a/types/api.ts +++ b/types/api.ts @@ -1,6 +1,6 @@ -import type { Application, Token, User } from "@versia/kit/db"; import type * as VersiaEntities from "@versia/sdk/entities"; import type { ConfigSchema } from "@versia-server/config/schema"; +import type { Application, Token, User } from "@versia-server/kit/db"; import type { SocketAddress } from "bun"; import type { Hono } from "hono"; import type { RouterRoute } from "hono/types"; diff --git a/utils/challenges.ts b/utils/challenges.ts index f9f39d83..01422ba3 100644 --- a/utils/challenges.ts +++ b/utils/challenges.ts @@ -1,6 +1,6 @@ -import { db } from "@versia/kit/db"; -import { Challenges } from "@versia/kit/tables"; import { config } from "@versia-server/config"; +import { db } from "@versia-server/kit/db"; +import { Challenges } from "@versia-server/kit/tables"; import { createChallenge } from "altcha-lib"; import type { Challenge } from "altcha-lib/types"; import { randomUUIDv7 } from "bun"; diff --git a/utils/rss.ts b/utils/rss.ts index f794b77d..31316119 100644 --- a/utils/rss.ts +++ b/utils/rss.ts @@ -1,6 +1,6 @@ -import { Media, Note, type User } from "@versia/kit/db"; -import { Notes } from "@versia/kit/tables"; import { config } from "@versia-server/config"; +import { Media, Note, type User } from "@versia-server/kit/db"; +import { Notes } from "@versia-server/kit/tables"; import { and, eq, inArray } from "drizzle-orm"; import { Feed } from "feed"; diff --git a/utils/server.ts b/utils/server.ts index 6cd047e9..3304abe1 100644 --- a/utils/server.ts +++ b/utils/server.ts @@ -1,5 +1,5 @@ -import { debugResponse } from "@versia/kit/api"; import type { ConfigSchema } from "@versia-server/config/schema"; +import { debugResponse } from "@versia-server/kit/api"; import { type Server, serve } from "bun"; import type { Hono } from "hono"; import type { z } from "zod";