From e52e230ce3b973a2cd944a35c644828d0c99b0ec Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Thu, 24 Oct 2024 16:28:38 +0200 Subject: [PATCH] refactor(database): :truck: Move database ORM code to classes/database The old directory, packages/database-interface, was confusingly named so it was better to move it here --- api/api/auth/login/index.test.ts | 2 +- api/api/auth/login/index.ts | 4 ++-- api/api/auth/reset/index.test.ts | 2 +- api/api/auth/reset/index.ts | 2 +- api/api/v1/accounts/:id/block.ts | 4 ++-- api/api/v1/accounts/:id/follow.ts | 4 ++-- api/api/v1/accounts/:id/followers.ts | 4 ++-- api/api/v1/accounts/:id/following.ts | 4 ++-- api/api/v1/accounts/:id/index.ts | 2 +- api/api/v1/accounts/:id/mute.ts | 4 ++-- api/api/v1/accounts/:id/note.ts | 4 ++-- api/api/v1/accounts/:id/pin.ts | 4 ++-- api/api/v1/accounts/:id/refetch.ts | 2 +- api/api/v1/accounts/:id/remove_from_followers.ts | 4 ++-- api/api/v1/accounts/:id/statuses.ts | 6 +++--- api/api/v1/accounts/:id/unblock.ts | 4 ++-- api/api/v1/accounts/:id/unfollow.ts | 4 ++-- api/api/v1/accounts/:id/unmute.ts | 4 ++-- api/api/v1/accounts/:id/unpin.ts | 4 ++-- api/api/v1/accounts/familiar_followers/index.ts | 2 +- api/api/v1/accounts/id/index.ts | 2 +- api/api/v1/accounts/index.ts | 2 +- api/api/v1/accounts/lookup/index.ts | 2 +- api/api/v1/accounts/relationships/index.ts | 2 +- api/api/v1/accounts/search/index.ts | 2 +- api/api/v1/accounts/update_credentials/index.ts | 6 +++--- api/api/v1/accounts/verify_credentials/index.ts | 2 +- api/api/v1/apps/index.ts | 2 +- api/api/v1/apps/verify_credentials/index.ts | 2 +- api/api/v1/blocks/index.ts | 4 ++-- api/api/v1/custom_emojis/index.ts | 2 +- api/api/v1/emojis/:id/index.ts | 4 ++-- api/api/v1/emojis/index.ts | 4 ++-- api/api/v1/favourites/index.ts | 4 ++-- .../v1/follow_requests/:account_id/authorize.ts | 4 ++-- api/api/v1/follow_requests/:account_id/reject.ts | 4 ++-- api/api/v1/follow_requests/index.ts | 4 ++-- api/api/v1/instance/index.ts | 6 +++--- api/api/v1/media/:id/index.ts | 2 +- api/api/v1/media/index.ts | 2 +- api/api/v1/mutes/index.ts | 4 ++-- api/api/v1/notifications/:id/index.ts | 4 ++-- api/api/v1/notifications/index.ts | 4 ++-- api/api/v1/profile/avatar.ts | 2 +- api/api/v1/profile/header.ts | 2 +- api/api/v1/roles/:id/index.test.ts | 2 +- api/api/v1/roles/:id/index.ts | 2 +- api/api/v1/roles/index.test.ts | 2 +- api/api/v1/roles/index.ts | 2 +- api/api/v1/statuses/:id/context.ts | 2 +- api/api/v1/statuses/:id/favourite.ts | 2 +- api/api/v1/statuses/:id/favourited_by.ts | 6 +++--- api/api/v1/statuses/:id/index.ts | 4 ++-- api/api/v1/statuses/:id/pin.ts | 2 +- api/api/v1/statuses/:id/reblog.ts | 2 +- api/api/v1/statuses/:id/reblogged_by.ts | 6 +++--- api/api/v1/statuses/:id/source.ts | 2 +- api/api/v1/statuses/:id/unfavourite.ts | 2 +- api/api/v1/statuses/:id/unpin.ts | 2 +- api/api/v1/statuses/:id/unreblog.ts | 2 +- api/api/v1/statuses/index.ts | 4 ++-- api/api/v1/timelines/home.ts | 4 ++-- api/api/v1/timelines/public.ts | 4 ++-- api/api/v2/instance/index.ts | 2 +- api/api/v2/media/index.ts | 2 +- api/api/v2/search/index.ts | 4 ++-- api/objects/:id/index.ts | 4 ++-- api/users/:uuid/inbox/index.ts | 6 +++--- api/users/:uuid/index.ts | 2 +- api/users/:uuid/outbox/index.ts | 4 ++-- api/well-known/versia.ts | 2 +- api/well-known/webfinger/index.ts | 2 +- .../database}/application.ts | 0 .../database}/attachment.ts | 0 .../database}/base.ts | 0 .../database}/emoji.ts | 0 .../database}/instance.ts | 0 .../database}/note.ts | 0 .../database}/relationship.ts | 0 .../database}/role.ts | 0 .../database}/timeline.ts | 0 .../database}/user.ts | 0 classes/functions/like.ts | 4 ++-- classes/functions/notification.ts | 4 ++-- classes/functions/status.ts | 6 +++--- classes/functions/user.ts | 6 +++--- classes/search/search-manager.ts | 4 ++-- cli/classes.ts | 4 ++-- cli/commands/emoji/add.ts | 4 ++-- cli/commands/emoji/import.ts | 4 ++-- cli/commands/federation/instance/fetch.ts | 2 +- cli/commands/federation/user/fetch.ts | 4 ++-- cli/commands/federation/user/finger.ts | 4 ++-- cli/commands/user/create.ts | 2 +- cli/commands/user/list.ts | 2 +- packages/plugin-kit/exports/db.ts | 16 ++++++++-------- plugins/openid/routes/authorize.test.ts | 2 +- plugins/openid/routes/authorize.ts | 4 ++-- plugins/openid/routes/jwks.test.ts | 2 +- plugins/openid/routes/oauth/revoke.test.ts | 2 +- plugins/openid/routes/oauth/sso.ts | 2 +- plugins/openid/routes/oauth/token.test.ts | 2 +- plugins/openid/routes/oauth/token.ts | 2 +- setup.ts | 2 +- tests/oauth-scopes.test.ts | 2 +- tests/utils.ts | 4 ++-- types/api.ts | 4 ++-- utils/api.ts | 4 ++-- utils/init.ts | 2 +- utils/oauth.ts | 2 +- 110 files changed, 165 insertions(+), 165 deletions(-) rename {packages/database-interface => classes/database}/application.ts (100%) rename {packages/database-interface => classes/database}/attachment.ts (100%) rename {packages/database-interface => classes/database}/base.ts (100%) rename {packages/database-interface => classes/database}/emoji.ts (100%) rename {packages/database-interface => classes/database}/instance.ts (100%) rename {packages/database-interface => classes/database}/note.ts (100%) rename {packages/database-interface => classes/database}/relationship.ts (100%) rename {packages/database-interface => classes/database}/role.ts (100%) rename {packages/database-interface => classes/database}/timeline.ts (100%) rename {packages/database-interface => classes/database}/user.ts (100%) diff --git a/api/api/auth/login/index.test.ts b/api/api/auth/login/index.test.ts index 23a4f862..c65086c4 100644 --- a/api/api/auth/login/index.test.ts +++ b/api/api/auth/login/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { randomString } from "@/math"; +import { Application } from "~/classes/database/application.ts"; import { config } from "~/packages/config-manager"; -import { Application } from "~/packages/database-interface/application.ts"; import { fakeRequest, getTestUsers } from "~/tests/utils"; import { meta } from "./index.ts"; diff --git a/api/api/auth/login/index.ts b/api/api/auth/login/index.ts index f82e5123..0a920af7 100644 --- a/api/api/auth/login/index.ts +++ b/api/api/auth/login/index.ts @@ -5,10 +5,10 @@ import { createRoute } from "@hono/zod-openapi"; import { eq, or } from "drizzle-orm"; import { SignJWT } from "jose"; import { z } from "zod"; +import { Application } from "~/classes/database/application"; +import { User } from "~/classes/database/user"; import { Users } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Application } from "~/packages/database-interface/application"; -import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ ratelimits: { diff --git a/api/api/auth/reset/index.test.ts b/api/api/auth/reset/index.test.ts index a6878008..fbb5dc9c 100644 --- a/api/api/auth/reset/index.test.ts +++ b/api/api/auth/reset/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, test } from "bun:test"; import { randomString } from "@/math"; +import { Application } from "~/classes/database/application.ts"; import { config } from "~/packages/config-manager"; -import { Application } from "~/packages/database-interface/application.ts"; import { fakeRequest, getTestUsers } from "~/tests/utils"; import { meta } from "./index.ts"; diff --git a/api/api/auth/reset/index.ts b/api/api/auth/reset/index.ts index db74e652..2b8f1ffd 100644 --- a/api/api/auth/reset/index.ts +++ b/api/api/auth/reset/index.ts @@ -3,9 +3,9 @@ import { createRoute } from "@hono/zod-openapi"; import { eq } from "drizzle-orm"; import type { Context } from "hono"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { Users } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ ratelimits: { diff --git a/api/api/v1/accounts/:id/block.ts b/api/api/v1/accounts/:id/block.ts index 8a1c45af..b566c00c 100644 --- a/api/api/v1/accounts/:id/block.ts +++ b/api/api/v1/accounts/:id/block.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/follow.ts b/api/api/v1/accounts/:id/follow.ts index 734c0a6f..c5983941 100644 --- a/api/api/v1/accounts/:id/follow.ts +++ b/api/api/v1/accounts/:id/follow.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import ISO6391 from "iso-639-1"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/followers.ts b/api/api/v1/accounts/:id/followers.ts index e2e8751e..f23c4e82 100644 --- a/api/api/v1/accounts/:id/followers.ts +++ b/api/api/v1/accounts/:id/followers.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/following.ts b/api/api/v1/accounts/:id/following.ts index c1136e8f..dea6f24f 100644 --- a/api/api/v1/accounts/:id/following.ts +++ b/api/api/v1/accounts/:id/following.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/index.ts b/api/api/v1/accounts/:id/index.ts index 702a42a8..33c37ce9 100644 --- a/api/api/v1/accounts/:id/index.ts +++ b/api/api/v1/accounts/:id/index.ts @@ -1,8 +1,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/mute.ts b/api/api/v1/accounts/:id/mute.ts index 5b581324..e679f27c 100644 --- a/api/api/v1/accounts/:id/mute.ts +++ b/api/api/v1/accounts/:id/mute.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/note.ts b/api/api/v1/accounts/:id/note.ts index 63971a69..de0ad2c0 100644 --- a/api/api/v1/accounts/:id/note.ts +++ b/api/api/v1/accounts/:id/note.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/pin.ts b/api/api/v1/accounts/:id/pin.ts index 1d7360a4..168e5286 100644 --- a/api/api/v1/accounts/:id/pin.ts +++ b/api/api/v1/accounts/:id/pin.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/refetch.ts b/api/api/v1/accounts/:id/refetch.ts index 88e1fe28..e583b182 100644 --- a/api/api/v1/accounts/:id/refetch.ts +++ b/api/api/v1/accounts/:id/refetch.ts @@ -1,8 +1,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/remove_from_followers.ts b/api/api/v1/accounts/:id/remove_from_followers.ts index 87274eff..2a8126f4 100644 --- a/api/api/v1/accounts/:id/remove_from_followers.ts +++ b/api/api/v1/accounts/:id/remove_from_followers.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/statuses.ts b/api/api/v1/accounts/:id/statuses.ts index da0d5fe7..c00cd129 100644 --- a/api/api/v1/accounts/:id/statuses.ts +++ b/api/api/v1/accounts/:id/statuses.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, eq, gt, gte, isNull, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { Notes, RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/unblock.ts b/api/api/v1/accounts/:id/unblock.ts index 957c5e6f..60b4d235 100644 --- a/api/api/v1/accounts/:id/unblock.ts +++ b/api/api/v1/accounts/:id/unblock.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/unfollow.ts b/api/api/v1/accounts/:id/unfollow.ts index c60fc436..70b95106 100644 --- a/api/api/v1/accounts/:id/unfollow.ts +++ b/api/api/v1/accounts/:id/unfollow.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/unmute.ts b/api/api/v1/accounts/:id/unmute.ts index 85b759fa..89a0444d 100644 --- a/api/api/v1/accounts/:id/unmute.ts +++ b/api/api/v1/accounts/:id/unmute.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/:id/unpin.ts b/api/api/v1/accounts/:id/unpin.ts index 6f1c48be..f254fad6 100644 --- a/api/api/v1/accounts/:id/unpin.ts +++ b/api/api/v1/accounts/:id/unpin.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/familiar_followers/index.ts b/api/api/v1/accounts/familiar_followers/index.ts index 14522fe5..0f0b87ec 100644 --- a/api/api/v1/accounts/familiar_followers/index.ts +++ b/api/api/v1/accounts/familiar_followers/index.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, qsQuery } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { inArray } from "drizzle-orm"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { db } from "~/drizzle/db"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/id/index.ts b/api/api/v1/accounts/id/index.ts index 3234db49..5998ed2c 100644 --- a/api/api/v1/accounts/id/index.ts +++ b/api/api/v1/accounts/id/index.ts @@ -2,8 +2,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, eq, isNull } from "drizzle-orm"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/index.ts b/api/api/v1/accounts/index.ts index 4a6ed5a1..65f88ee6 100644 --- a/api/api/v1/accounts/index.ts +++ b/api/api/v1/accounts/index.ts @@ -4,9 +4,9 @@ import { createRoute } from "@hono/zod-openapi"; import { and, eq, isNull } from "drizzle-orm"; import ISO6391 from "iso-639-1"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { Users } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ route: "/api/v1/accounts", diff --git a/api/api/v1/accounts/lookup/index.ts b/api/api/v1/accounts/lookup/index.ts index 50c5ed7c..a2fd013f 100644 --- a/api/api/v1/accounts/lookup/index.ts +++ b/api/api/v1/accounts/lookup/index.ts @@ -13,8 +13,8 @@ import { oneOrMore, } from "magic-regexp"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/relationships/index.ts b/api/api/v1/accounts/relationships/index.ts index 6a69e49b..c8ff7a50 100644 --- a/api/api/v1/accounts/relationships/index.ts +++ b/api/api/v1/accounts/relationships/index.ts @@ -1,8 +1,8 @@ import { apiRoute, applyConfig, auth, qsQuery } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/search/index.ts b/api/api/v1/accounts/search/index.ts index e2f027f0..0aed208b 100644 --- a/api/api/v1/accounts/search/index.ts +++ b/api/api/v1/accounts/search/index.ts @@ -14,8 +14,8 @@ import { } from "magic-regexp"; import stringComparison from "string-comparison"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/update_credentials/index.ts b/api/api/v1/accounts/update_credentials/index.ts index 97c3a93c..e34f98af 100644 --- a/api/api/v1/accounts/update_credentials/index.ts +++ b/api/api/v1/accounts/update_credentials/index.ts @@ -4,14 +4,14 @@ import { createRoute } from "@hono/zod-openapi"; import { and, eq, isNull } from "drizzle-orm"; import ISO6391 from "iso-639-1"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; +import { Emoji } from "~/classes/database/emoji"; +import { User } from "~/classes/database/user"; import { contentToHtml } from "~/classes/functions/status"; import { MediaManager } from "~/classes/media/media-manager"; import { db } from "~/drizzle/db"; import { EmojiToUser, RolePermissions, Users } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Attachment } from "~/packages/database-interface/attachment"; -import { Emoji } from "~/packages/database-interface/emoji"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/accounts/verify_credentials/index.ts b/api/api/v1/accounts/verify_credentials/index.ts index 562dfee9..db41ceb2 100644 --- a/api/api/v1/accounts/verify_credentials/index.ts +++ b/api/api/v1/accounts/verify_credentials/index.ts @@ -1,6 +1,6 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; -import { User } from "~/packages/database-interface/user"; +import { User } from "~/classes/database/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/apps/index.ts b/api/api/v1/apps/index.ts index ff92e63b..bf70f613 100644 --- a/api/api/v1/apps/index.ts +++ b/api/api/v1/apps/index.ts @@ -2,8 +2,8 @@ import { apiRoute, applyConfig, jsonOrForm } from "@/api"; import { randomString } from "@/math"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Application } from "~/classes/database/application"; import { RolePermissions } from "~/drizzle/schema"; -import { Application } from "~/packages/database-interface/application"; export const meta = applyConfig({ route: "/api/v1/apps", diff --git a/api/api/v1/apps/verify_credentials/index.ts b/api/api/v1/apps/verify_credentials/index.ts index cbd47375..df8006b6 100644 --- a/api/api/v1/apps/verify_credentials/index.ts +++ b/api/api/v1/apps/verify_credentials/index.ts @@ -1,7 +1,7 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; +import { Application } from "~/classes/database/application"; import { RolePermissions } from "~/drizzle/schema"; -import { Application } from "~/packages/database-interface/application"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/blocks/index.ts b/api/api/v1/blocks/index.ts index be130474..95df58ee 100644 --- a/api/api/v1/blocks/index.ts +++ b/api/api/v1/blocks/index.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/custom_emojis/index.ts b/api/api/v1/custom_emojis/index.ts index b07f4f23..de4f0f15 100644 --- a/api/api/v1/custom_emojis/index.ts +++ b/api/api/v1/custom_emojis/index.ts @@ -1,8 +1,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute, z } from "@hono/zod-openapi"; import { and, eq, isNull, or } from "drizzle-orm"; +import { Emoji } from "~/classes/database/emoji"; import { Emojis, RolePermissions } from "~/drizzle/schema"; -import { Emoji } from "~/packages/database-interface/emoji"; export const meta = applyConfig({ route: "/api/v1/custom_emojis", diff --git a/api/api/v1/emojis/:id/index.ts b/api/api/v1/emojis/:id/index.ts index 247bba3b..1969f6c9 100644 --- a/api/api/v1/emojis/:id/index.ts +++ b/api/api/v1/emojis/:id/index.ts @@ -3,12 +3,12 @@ import { mimeLookup } from "@/content_types"; import { createRoute } from "@hono/zod-openapi"; import { eq } from "drizzle-orm"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; +import { Emoji } from "~/classes/database/emoji"; import { MediaManager } from "~/classes/media/media-manager"; import { db } from "~/drizzle/db"; import { Emojis, RolePermissions } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Attachment } from "~/packages/database-interface/attachment"; -import { Emoji } from "~/packages/database-interface/emoji"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/emojis/index.ts b/api/api/v1/emojis/index.ts index 6aa2beaa..7a0f2eef 100644 --- a/api/api/v1/emojis/index.ts +++ b/api/api/v1/emojis/index.ts @@ -3,11 +3,11 @@ import { mimeLookup } from "@/content_types"; import { createRoute } from "@hono/zod-openapi"; import { and, eq, isNull, or } from "drizzle-orm"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; +import { Emoji } from "~/classes/database/emoji"; import { MediaManager } from "~/classes/media/media-manager"; import { Emojis, RolePermissions } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Attachment } from "~/packages/database-interface/attachment"; -import { Emoji } from "~/packages/database-interface/emoji"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/favourites/index.ts b/api/api/v1/favourites/index.ts index 527099fd..4ad3b010 100644 --- a/api/api/v1/favourites/index.ts +++ b/api/api/v1/favourites/index.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { Timeline } from "~/classes/database/timeline"; import { Notes, RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { Timeline } from "~/packages/database-interface/timeline"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/follow_requests/:account_id/authorize.ts b/api/api/v1/follow_requests/:account_id/authorize.ts index 112e821f..5b9a9f40 100644 --- a/api/api/v1/follow_requests/:account_id/authorize.ts +++ b/api/api/v1/follow_requests/:account_id/authorize.ts @@ -1,10 +1,10 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { sendFollowAccept } from "~/classes/functions/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/follow_requests/:account_id/reject.ts b/api/api/v1/follow_requests/:account_id/reject.ts index 144e2360..73f56533 100644 --- a/api/api/v1/follow_requests/:account_id/reject.ts +++ b/api/api/v1/follow_requests/:account_id/reject.ts @@ -1,10 +1,10 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { sendFollowReject } from "~/classes/functions/user"; import { RolePermissions } from "~/drizzle/schema"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/follow_requests/index.ts b/api/api/v1/follow_requests/index.ts index 6d967076..9e05945d 100644 --- a/api/api/v1/follow_requests/index.ts +++ b/api/api/v1/follow_requests/index.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/instance/index.ts b/api/api/v1/instance/index.ts index 0affc2cd..aec67280 100644 --- a/api/api/v1/instance/index.ts +++ b/api/api/v1/instance/index.ts @@ -2,12 +2,12 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { proxyUrl } from "@/response"; import { createRoute, z } from "@hono/zod-openapi"; import { and, eq, isNull } from "drizzle-orm"; +import { Instance } from "~/classes/database/instance"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import { Users } from "~/drizzle/schema"; import manifest from "~/package.json"; import { config } from "~/packages/config-manager"; -import { Instance } from "~/packages/database-interface/instance"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ route: "/api/v1/instance", diff --git a/api/api/v1/media/:id/index.ts b/api/api/v1/media/:id/index.ts index 2faf4e14..d220afcf 100644 --- a/api/api/v1/media/:id/index.ts +++ b/api/api/v1/media/:id/index.ts @@ -1,10 +1,10 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; import { MediaManager } from "~/classes/media/media-manager"; import { RolePermissions } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Attachment } from "~/packages/database-interface/attachment"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/media/index.ts b/api/api/v1/media/index.ts index de4cc928..83f7b517 100644 --- a/api/api/v1/media/index.ts +++ b/api/api/v1/media/index.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import sharp from "sharp"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; import { MediaManager } from "~/classes/media/media-manager"; import { RolePermissions } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Attachment } from "~/packages/database-interface/attachment"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/mutes/index.ts b/api/api/v1/mutes/index.ts index f48a59a1..2401dd34 100644 --- a/api/api/v1/mutes/index.ts +++ b/api/api/v1/mutes/index.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/notifications/:id/index.ts b/api/api/v1/notifications/:id/index.ts index 68191bed..20b6b1e0 100644 --- a/api/api/v1/notifications/:id/index.ts +++ b/api/api/v1/notifications/:id/index.ts @@ -1,13 +1,13 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import { findManyNotifications, notificationToApi, } from "~/classes/functions/notification"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/notifications/index.ts b/api/api/v1/notifications/index.ts index 22465776..2710b676 100644 --- a/api/api/v1/notifications/index.ts +++ b/api/api/v1/notifications/index.ts @@ -3,14 +3,14 @@ import { fetchTimeline } from "@/timelines"; import { createRoute } from "@hono/zod-openapi"; import { sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import { findManyNotifications, notificationToApi, } from "~/classes/functions/notification"; import type { NotificationWithRelations } from "~/classes/functions/notification"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/profile/avatar.ts b/api/api/v1/profile/avatar.ts index e8a3ad23..d61dfa94 100644 --- a/api/api/v1/profile/avatar.ts +++ b/api/api/v1/profile/avatar.ts @@ -1,7 +1,7 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/profile/header.ts b/api/api/v1/profile/header.ts index 46a753cc..c10c30b1 100644 --- a/api/api/v1/profile/header.ts +++ b/api/api/v1/profile/header.ts @@ -1,7 +1,7 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; +import { User } from "~/classes/database/user"; import { RolePermissions } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/roles/:id/index.test.ts b/api/api/v1/roles/:id/index.test.ts index cc84214a..ec3ec423 100644 --- a/api/api/v1/roles/:id/index.test.ts +++ b/api/api/v1/roles/:id/index.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { Role } from "~/classes/database/role.ts"; import { ADMIN_ROLES, DEFAULT_ROLES, RolePermissions } from "~/drizzle/schema"; -import { Role } from "~/packages/database-interface/role"; import { fakeRequest, getTestUsers } from "~/tests/utils"; import { meta } from "./index.ts"; diff --git a/api/api/v1/roles/:id/index.ts b/api/api/v1/roles/:id/index.ts index 6534fdc7..727d90a5 100644 --- a/api/api/v1/roles/:id/index.ts +++ b/api/api/v1/roles/:id/index.ts @@ -1,8 +1,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Role } from "~/classes/database/role"; import { RolePermissions } from "~/drizzle/schema"; -import { Role } from "~/packages/database-interface/role"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/roles/index.test.ts b/api/api/v1/roles/index.test.ts index 7666e0ba..c5221f4a 100644 --- a/api/api/v1/roles/index.test.ts +++ b/api/api/v1/roles/index.test.ts @@ -1,7 +1,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { Role } from "~/classes/database/role.ts"; import { ADMIN_ROLES } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Role } from "~/packages/database-interface/role"; import { fakeRequest, getTestUsers } from "~/tests/utils"; import { meta } from "./index.ts"; diff --git a/api/api/v1/roles/index.ts b/api/api/v1/roles/index.ts index 254a0273..54e05d4f 100644 --- a/api/api/v1/roles/index.ts +++ b/api/api/v1/roles/index.ts @@ -1,6 +1,6 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute, z } from "@hono/zod-openapi"; -import { Role } from "~/packages/database-interface/role"; +import { Role } from "~/classes/database/role"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/context.ts b/api/api/v1/statuses/:id/context.ts index dc2f0456..62343cfb 100644 --- a/api/api/v1/statuses/:id/context.ts +++ b/api/api/v1/statuses/:id/context.ts @@ -1,8 +1,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/favourite.ts b/api/api/v1/statuses/:id/favourite.ts index 4008f4ed..bfe3ca1f 100644 --- a/api/api/v1/statuses/:id/favourite.ts +++ b/api/api/v1/statuses/:id/favourite.ts @@ -1,10 +1,10 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { createLike } from "~/classes/functions/like"; import { db } from "~/drizzle/db"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/favourited_by.ts b/api/api/v1/statuses/:id/favourited_by.ts index ad3118c6..12800b05 100644 --- a/api/api/v1/statuses/:id/favourited_by.ts +++ b/api/api/v1/statuses/:id/favourited_by.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/index.ts b/api/api/v1/statuses/:id/index.ts index 974464d9..cf3b4522 100644 --- a/api/api/v1/statuses/:id/index.ts +++ b/api/api/v1/statuses/:id/index.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth, idValidator, jsonOrForm } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import ISO6391 from "iso-639-1"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; +import { Note } from "~/classes/database/note"; import { RolePermissions } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Attachment } from "~/packages/database-interface/attachment"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/pin.ts b/api/api/v1/statuses/:id/pin.ts index 39f9ff30..066c1661 100644 --- a/api/api/v1/statuses/:id/pin.ts +++ b/api/api/v1/statuses/:id/pin.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { db } from "~/drizzle/db"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/reblog.ts b/api/api/v1/statuses/:id/reblog.ts index 1800e377..34cffffc 100644 --- a/api/api/v1/statuses/:id/reblog.ts +++ b/api/api/v1/statuses/:id/reblog.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { db } from "~/drizzle/db"; import { Notes, Notifications, RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/reblogged_by.ts b/api/api/v1/statuses/:id/reblogged_by.ts index 95e3511b..6983e44f 100644 --- a/api/api/v1/statuses/:id/reblogged_by.ts +++ b/api/api/v1/statuses/:id/reblogged_by.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { Timeline } from "~/classes/database/timeline"; +import { User } from "~/classes/database/user"; import { RolePermissions, Users } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { Timeline } from "~/packages/database-interface/timeline"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/source.ts b/api/api/v1/statuses/:id/source.ts index 6ea0fa22..706ca35f 100644 --- a/api/api/v1/statuses/:id/source.ts +++ b/api/api/v1/statuses/:id/source.ts @@ -2,8 +2,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import type { StatusSource as ApiStatusSource } from "@versia/client/types"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/unfavourite.ts b/api/api/v1/statuses/:id/unfavourite.ts index 724bb7cb..313f821d 100644 --- a/api/api/v1/statuses/:id/unfavourite.ts +++ b/api/api/v1/statuses/:id/unfavourite.ts @@ -1,9 +1,9 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { deleteLike } from "~/classes/functions/like"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/unpin.ts b/api/api/v1/statuses/:id/unpin.ts index 49b93c68..5a5dedc9 100644 --- a/api/api/v1/statuses/:id/unpin.ts +++ b/api/api/v1/statuses/:id/unpin.ts @@ -1,8 +1,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/:id/unreblog.ts b/api/api/v1/statuses/:id/unreblog.ts index ee00ed14..0c02e472 100644 --- a/api/api/v1/statuses/:id/unreblog.ts +++ b/api/api/v1/statuses/:id/unreblog.ts @@ -2,8 +2,8 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; import { Notes, RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/statuses/index.ts b/api/api/v1/statuses/index.ts index 570ec1e8..deb5ced1 100644 --- a/api/api/v1/statuses/index.ts +++ b/api/api/v1/statuses/index.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import ISO6391 from "iso-639-1"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; +import { Note } from "~/classes/database/note"; import { RolePermissions } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Attachment } from "~/packages/database-interface/attachment"; -import { Note } from "~/packages/database-interface/note"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/timelines/home.ts b/api/api/v1/timelines/home.ts index 2ef1761c..ff6b7674 100644 --- a/api/api/v1/timelines/home.ts +++ b/api/api/v1/timelines/home.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, eq, gt, gte, lt, or, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { Timeline } from "~/classes/database/timeline"; import { Notes, RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { Timeline } from "~/packages/database-interface/timeline"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v1/timelines/public.ts b/api/api/v1/timelines/public.ts index aa191442..e2890a22 100644 --- a/api/api/v1/timelines/public.ts +++ b/api/api/v1/timelines/public.ts @@ -2,9 +2,9 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { and, gt, gte, lt, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { Timeline } from "~/classes/database/timeline"; import { Notes, RolePermissions } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { Timeline } from "~/packages/database-interface/timeline"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v2/instance/index.ts b/api/api/v2/instance/index.ts index 4001e457..c9b243c9 100644 --- a/api/api/v2/instance/index.ts +++ b/api/api/v2/instance/index.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig } from "@/api"; import { proxyUrl } from "@/response"; import { createRoute, z } from "@hono/zod-openapi"; import { and, eq, isNull } from "drizzle-orm"; +import { User } from "~/classes/database/user"; import { Users } from "~/drizzle/schema"; import manifest from "~/package.json"; import { config } from "~/packages/config-manager"; -import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ route: "/api/v2/instance", diff --git a/api/api/v2/media/index.ts b/api/api/v2/media/index.ts index a377355d..20e5ee54 100644 --- a/api/api/v2/media/index.ts +++ b/api/api/v2/media/index.ts @@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import sharp from "sharp"; import { z } from "zod"; +import { Attachment } from "~/classes/database/attachment"; import { MediaManager } from "~/classes/media/media-manager"; import { RolePermissions } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Attachment } from "~/packages/database-interface/attachment"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/api/v2/search/index.ts b/api/api/v2/search/index.ts index 564db29b..fb6bcebb 100644 --- a/api/api/v2/search/index.ts +++ b/api/api/v2/search/index.ts @@ -8,12 +8,12 @@ import { import { createRoute } from "@hono/zod-openapi"; import { and, eq, inArray, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import { searchManager } from "~/classes/search/search-manager"; import { db } from "~/drizzle/db"; import { Instances, Notes, RolePermissions, Users } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/objects/:id/index.ts b/api/objects/:id/index.ts index b6db1be5..a7fd49ab 100644 --- a/api/objects/:id/index.ts +++ b/api/objects/:id/index.ts @@ -6,12 +6,12 @@ import { } from "@versia/federation/schemas"; import { and, eq, inArray, sql } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import { type LikeType, likeToVersia } from "~/classes/functions/like"; import { db } from "~/drizzle/db"; import { Notes } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema, type KnownEntity } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/users/:uuid/inbox/index.ts b/api/users/:uuid/inbox/index.ts index 6d8c8681..bb6f89bf 100644 --- a/api/users/:uuid/inbox/index.ts +++ b/api/users/:uuid/inbox/index.ts @@ -12,13 +12,13 @@ import { eq } from "drizzle-orm"; import { matches } from "ip-matching"; import { z } from "zod"; import { type ValidationError, isValidationError } from "zod-validation-error"; +import { Note } from "~/classes/database/note"; +import { Relationship } from "~/classes/database/relationship"; +import { User } from "~/classes/database/user"; import { sendFollowAccept } from "~/classes/functions/user"; import { db } from "~/drizzle/db"; import { Notes, Notifications } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Note } from "~/packages/database-interface/note"; -import { Relationship } from "~/packages/database-interface/relationship"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/users/:uuid/index.ts b/api/users/:uuid/index.ts index 917e3ac9..83ae1713 100644 --- a/api/users/:uuid/index.ts +++ b/api/users/:uuid/index.ts @@ -2,7 +2,7 @@ import { apiRoute, applyConfig } from "@/api"; import { createRoute } from "@hono/zod-openapi"; import { User as UserSchema } from "@versia/federation/schemas"; import { z } from "zod"; -import { User } from "~/packages/database-interface/user"; +import { User } from "~/classes/database/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/users/:uuid/outbox/index.ts b/api/users/:uuid/outbox/index.ts index 58bf16a5..757fe796 100644 --- a/api/users/:uuid/outbox/index.ts +++ b/api/users/:uuid/outbox/index.ts @@ -6,11 +6,11 @@ import { } from "@versia/federation/schemas"; import { and, eq, inArray } from "drizzle-orm"; import { z } from "zod"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import { db } from "~/drizzle/db"; import { Notes } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/api/well-known/versia.ts b/api/well-known/versia.ts index 21d0b871..f9fbf989 100644 --- a/api/well-known/versia.ts +++ b/api/well-known/versia.ts @@ -3,10 +3,10 @@ import { urlToContentFormat } from "@/content_types"; import { createRoute } from "@hono/zod-openapi"; import { InstanceMetadata as InstanceMetadataSchema } from "@versia/federation/schemas"; import { asc } from "drizzle-orm"; +import { User } from "~/classes/database/user"; import { Users } from "~/drizzle/schema"; import pkg from "~/package.json"; import { config } from "~/packages/config-manager"; -import { User } from "~/packages/database-interface/user"; export const meta = applyConfig({ auth: { diff --git a/api/well-known/webfinger/index.ts b/api/well-known/webfinger/index.ts index 5e7855e3..128dccea 100644 --- a/api/well-known/webfinger/index.ts +++ b/api/well-known/webfinger/index.ts @@ -6,9 +6,9 @@ import { WebFinger } from "@versia/federation/schemas"; import { and, eq, isNull } from "drizzle-orm"; import { lookup } from "mime-types"; import { z } from "zod"; +import { User } from "~/classes/database/user"; import { Users } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { User } from "~/packages/database-interface/user"; import { ErrorSchema } from "~/types/api"; export const meta = applyConfig({ diff --git a/packages/database-interface/application.ts b/classes/database/application.ts similarity index 100% rename from packages/database-interface/application.ts rename to classes/database/application.ts diff --git a/packages/database-interface/attachment.ts b/classes/database/attachment.ts similarity index 100% rename from packages/database-interface/attachment.ts rename to classes/database/attachment.ts diff --git a/packages/database-interface/base.ts b/classes/database/base.ts similarity index 100% rename from packages/database-interface/base.ts rename to classes/database/base.ts diff --git a/packages/database-interface/emoji.ts b/classes/database/emoji.ts similarity index 100% rename from packages/database-interface/emoji.ts rename to classes/database/emoji.ts diff --git a/packages/database-interface/instance.ts b/classes/database/instance.ts similarity index 100% rename from packages/database-interface/instance.ts rename to classes/database/instance.ts diff --git a/packages/database-interface/note.ts b/classes/database/note.ts similarity index 100% rename from packages/database-interface/note.ts rename to classes/database/note.ts diff --git a/packages/database-interface/relationship.ts b/classes/database/relationship.ts similarity index 100% rename from packages/database-interface/relationship.ts rename to classes/database/relationship.ts diff --git a/packages/database-interface/role.ts b/classes/database/role.ts similarity index 100% rename from packages/database-interface/role.ts rename to classes/database/role.ts diff --git a/packages/database-interface/timeline.ts b/classes/database/timeline.ts similarity index 100% rename from packages/database-interface/timeline.ts rename to classes/database/timeline.ts diff --git a/packages/database-interface/user.ts b/classes/database/user.ts similarity index 100% rename from packages/database-interface/user.ts rename to classes/database/user.ts diff --git a/classes/functions/like.ts b/classes/functions/like.ts index 98689695..e793a13b 100644 --- a/classes/functions/like.ts +++ b/classes/functions/like.ts @@ -1,10 +1,10 @@ import type { LikeExtension } from "@versia/federation/types"; import { type InferSelectModel, and, eq } from "drizzle-orm"; +import type { Note } from "~/classes/database/note"; +import type { User } from "~/classes/database/user"; import { db } from "~/drizzle/db"; import { Likes, Notifications } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import type { Note } from "~/packages/database-interface/note"; -import type { User } from "~/packages/database-interface/user"; export type LikeType = InferSelectModel; diff --git a/classes/functions/notification.ts b/classes/functions/notification.ts index 2856af9f..13c46071 100644 --- a/classes/functions/notification.ts +++ b/classes/functions/notification.ts @@ -1,9 +1,9 @@ import type { Notification as ApiNotification } from "@versia/client/types"; import type { InferSelectModel } from "drizzle-orm"; +import { Note } from "~/classes/database/note.ts"; +import { User } from "~/classes/database/user.ts"; import { db } from "~/drizzle/db"; import type { Notifications } from "~/drizzle/schema"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; import type { StatusWithRelations } from "./status.ts"; import { type UserWithRelations, diff --git a/classes/functions/status.ts b/classes/functions/status.ts index 61d0e98b..51f8df4c 100644 --- a/classes/functions/status.ts +++ b/classes/functions/status.ts @@ -24,6 +24,9 @@ import { import MarkdownIt from "markdown-it"; import markdownItContainer from "markdown-it-container"; import markdownItTocDoneRight from "markdown-it-toc-done-right"; +import type { ApplicationType } from "~/classes/database/application.ts"; +import type { EmojiWithInstance } from "~/classes/database/emoji.ts"; +import { User } from "~/classes/database/user.ts"; import { db } from "~/drizzle/db"; import { type Attachments, @@ -32,9 +35,6 @@ import { Users, } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import type { ApplicationType } from "~/packages/database-interface/application.ts"; -import type { EmojiWithInstance } from "~/packages/database-interface/emoji"; -import { User } from "~/packages/database-interface/user"; import { type UserWithInstance, type UserWithRelations, diff --git a/classes/functions/user.ts b/classes/functions/user.ts index 69dd8752..cdc7c7e7 100644 --- a/classes/functions/user.ts +++ b/classes/functions/user.ts @@ -4,6 +4,9 @@ import type { FollowReject, } from "@versia/federation/types"; import { type InferSelectModel, eq, sql } from "drizzle-orm"; +import type { ApplicationType } from "~/classes/database/application.ts"; +import type { EmojiWithInstance } from "~/classes/database/emoji.ts"; +import { User } from "~/classes/database/user.ts"; import { db } from "~/drizzle/db"; import { Applications, @@ -12,9 +15,6 @@ import { Tokens, type Users, } from "~/drizzle/schema"; -import type { ApplicationType } from "~/packages/database-interface/application.ts"; -import type { EmojiWithInstance } from "~/packages/database-interface/emoji"; -import { User } from "~/packages/database-interface/user"; import type { Token } from "./token.ts"; export type UserType = InferSelectModel; diff --git a/classes/search/search-manager.ts b/classes/search/search-manager.ts index b30a36cd..0b59931d 100644 --- a/classes/search/search-manager.ts +++ b/classes/search/search-manager.ts @@ -8,10 +8,10 @@ import { Ingest as SonicChannelIngest, Search as SonicChannelSearch, } from "sonic-channel"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import { db } from "~/drizzle/db"; import { type Config, config } from "~/packages/config-manager"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; /** * Enum for Sonic index types diff --git a/cli/classes.ts b/cli/classes.ts index aa336d02..8cb3d824 100644 --- a/cli/classes.ts +++ b/cli/classes.ts @@ -2,10 +2,10 @@ import { parseUserAddress, userAddressValidator } from "@/api"; import { Args, type Command, Flags, type Interfaces } from "@oclif/core"; import chalk from "chalk"; import { and, eq, getTableColumns, like } from "drizzle-orm"; +import { Instance } from "~/classes/database/instance.ts"; +import { User } from "~/classes/database/user.ts"; import { db } from "~/drizzle/db"; import { Emojis, Instances, Users } from "~/drizzle/schema"; -import { Instance } from "~/packages/database-interface/instance"; -import { User } from "~/packages/database-interface/user"; import { BaseCommand } from "./base.ts"; export type FlagsType = Interfaces.InferredFlags< diff --git a/cli/commands/emoji/add.ts b/cli/commands/emoji/add.ts index 4014fd2c..663bd195 100644 --- a/cli/commands/emoji/add.ts +++ b/cli/commands/emoji/add.ts @@ -2,12 +2,12 @@ import { Args } from "@oclif/core"; import chalk from "chalk"; import { and, eq, isNull } from "drizzle-orm"; import ora from "ora"; +import { Attachment } from "~/classes/database/attachment"; +import { Emoji } from "~/classes/database/emoji"; import { MediaManager } from "~/classes/media/media-manager"; import { BaseCommand } from "~/cli/base"; import { Emojis } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Attachment } from "~/packages/database-interface/attachment"; -import { Emoji } from "~/packages/database-interface/emoji"; export default class EmojiAdd extends BaseCommand { static override args = { diff --git a/cli/commands/emoji/import.ts b/cli/commands/emoji/import.ts index 81309b17..2ff2f996 100644 --- a/cli/commands/emoji/import.ts +++ b/cli/commands/emoji/import.ts @@ -4,12 +4,12 @@ import { and, inArray, isNull } from "drizzle-orm"; import { lookup } from "mime-types"; import ora from "ora"; import { unzip } from "unzipit"; +import { Attachment } from "~/classes/database/attachment"; +import { Emoji } from "~/classes/database/emoji"; import { MediaManager } from "~/classes/media/media-manager"; import { BaseCommand } from "~/cli/base"; import { Emojis } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Attachment } from "~/packages/database-interface/attachment"; -import { Emoji } from "~/packages/database-interface/emoji"; type MetaType = { emojis: { diff --git a/cli/commands/federation/instance/fetch.ts b/cli/commands/federation/instance/fetch.ts index 04bd3287..4ba24908 100644 --- a/cli/commands/federation/instance/fetch.ts +++ b/cli/commands/federation/instance/fetch.ts @@ -1,8 +1,8 @@ import { Args } from "@oclif/core"; import ora from "ora"; +import { Instance } from "~/classes/database/instance"; import { BaseCommand } from "~/cli/base"; import { formatArray } from "~/cli/utils/format"; -import { Instance } from "~/packages/database-interface/instance"; export default class FederationInstanceFetch extends BaseCommand< typeof FederationInstanceFetch diff --git a/cli/commands/federation/user/fetch.ts b/cli/commands/federation/user/fetch.ts index a2356bda..87759c7e 100644 --- a/cli/commands/federation/user/fetch.ts +++ b/cli/commands/federation/user/fetch.ts @@ -2,9 +2,9 @@ import { parseUserAddress, userAddressValidator } from "@/api"; import { Args } from "@oclif/core"; import chalk from "chalk"; import ora from "ora"; +import { Instance } from "~/classes/database/instance"; +import { User } from "~/classes/database/user"; import { BaseCommand } from "~/cli/base"; -import { Instance } from "~/packages/database-interface/instance"; -import { User } from "~/packages/database-interface/user"; export default class FederationUserFetch extends BaseCommand< typeof FederationUserFetch diff --git a/cli/commands/federation/user/finger.ts b/cli/commands/federation/user/finger.ts index bddff4b6..2e1e1212 100644 --- a/cli/commands/federation/user/finger.ts +++ b/cli/commands/federation/user/finger.ts @@ -2,9 +2,9 @@ import { parseUserAddress, userAddressValidator } from "@/api"; import { Args } from "@oclif/core"; import chalk from "chalk"; import ora from "ora"; +import { Instance } from "~/classes/database/instance"; +import { User } from "~/classes/database/user"; import { BaseCommand } from "~/cli/base"; -import { Instance } from "~/packages/database-interface/instance"; -import { User } from "~/packages/database-interface/user"; export default class FederationUserFinger extends BaseCommand< typeof FederationUserFinger diff --git a/cli/commands/user/create.ts b/cli/commands/user/create.ts index 10a73dae..dcd09f5a 100644 --- a/cli/commands/user/create.ts +++ b/cli/commands/user/create.ts @@ -3,10 +3,10 @@ import { Args, Flags } from "@oclif/core"; import chalk from "chalk"; import { eq } from "drizzle-orm"; import { renderUnicodeCompact } from "uqr"; +import { User } from "~/classes/database/user"; import { BaseCommand } from "~/cli/base"; import { formatArray } from "~/cli/utils/format"; import { Users } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; export default class UserCreate extends BaseCommand { static override args = { diff --git a/cli/commands/user/list.ts b/cli/commands/user/list.ts index 55f3416c..3a27a177 100644 --- a/cli/commands/user/list.ts +++ b/cli/commands/user/list.ts @@ -1,9 +1,9 @@ import { Flags } from "@oclif/core"; import { and, eq, isNotNull, isNull } from "drizzle-orm"; +import { User } from "~/classes/database/user"; import { BaseCommand } from "~/cli/base"; import { formatArray } from "~/cli/utils/format"; import { Users } from "~/drizzle/schema"; -import { User } from "~/packages/database-interface/user"; export default class UserList extends BaseCommand { static override args = {}; diff --git a/packages/plugin-kit/exports/db.ts b/packages/plugin-kit/exports/db.ts index 89040fec..469323d7 100644 --- a/packages/plugin-kit/exports/db.ts +++ b/packages/plugin-kit/exports/db.ts @@ -1,10 +1,10 @@ // biome-ignore lint/performance/noBarrelFile: -export { User } from "~/packages/database-interface/user"; -export { Role } from "~/packages/database-interface/role"; -export { Attachment } from "~/packages/database-interface/attachment"; -export { Emoji } from "~/packages/database-interface/emoji"; -export { Instance } from "~/packages/database-interface/instance"; -export { Note } from "~/packages/database-interface/note"; -export { Timeline } from "~/packages/database-interface/timeline"; -export { Application } from "~/packages/database-interface/application"; +export { User } from "~/classes/database/user"; +export { Role } from "~/classes/database/role"; +export { Attachment } from "~/classes/database/attachment"; +export { Emoji } from "~/classes/database/emoji"; +export { Instance } from "~/classes/database/instance"; +export { Note } from "~/classes/database/note"; +export { Timeline } from "~/classes/database/timeline"; +export { Application } from "~/classes/database/application"; export { db } from "~/drizzle/db"; diff --git a/plugins/openid/routes/authorize.test.ts b/plugins/openid/routes/authorize.test.ts index 32662156..1cf89459 100644 --- a/plugins/openid/routes/authorize.test.ts +++ b/plugins/openid/routes/authorize.test.ts @@ -2,8 +2,8 @@ import { afterAll, describe, expect, test } from "bun:test"; import { randomString } from "@/math"; import { RolePermissions } from "@versia/kit/tables"; import { SignJWT } from "jose"; +import { Application } from "~/classes/database/application"; import { config } from "~/packages/config-manager"; -import { Application } from "~/packages/database-interface/application"; import { fakeRequest, getTestUsers } from "~/tests/utils"; const { deleteUsers, tokens, users } = await getTestUsers(1); diff --git a/plugins/openid/routes/authorize.ts b/plugins/openid/routes/authorize.ts index 4d69170d..9833f268 100644 --- a/plugins/openid/routes/authorize.ts +++ b/plugins/openid/routes/authorize.ts @@ -5,9 +5,9 @@ import { RolePermissions, Tokens } from "@versia/kit/tables"; import { type JWTPayload, SignJWT, jwtVerify } from "jose"; import { JOSEError } from "jose/errors"; import { z } from "zod"; +import { Application } from "~/classes/database/application.ts"; +import { User } from "~/classes/database/user.ts"; import { TokenType } from "~/classes/functions/token"; -import { Application } from "~/packages/database-interface/application.ts"; -import { User } from "~/packages/database-interface/user"; import type { PluginType } from "../index.ts"; const schemas = { diff --git a/plugins/openid/routes/jwks.test.ts b/plugins/openid/routes/jwks.test.ts index 0e4039b2..dc4fa6dd 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 "~/packages/database-interface/application"; +import { Application } from "~/classes/database/application"; import { fakeRequest } from "~/tests/utils"; const application = await Application.insert({ diff --git a/plugins/openid/routes/oauth/revoke.test.ts b/plugins/openid/routes/oauth/revoke.test.ts index 3d556033..76ae7e01 100644 --- a/plugins/openid/routes/oauth/revoke.test.ts +++ b/plugins/openid/routes/oauth/revoke.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { db } from "@versia/kit/db"; import { eq } from "@versia/kit/drizzle"; import { Tokens } from "@versia/kit/tables"; -import { Application } from "~/packages/database-interface/application"; +import { Application } from "~/classes/database/application"; import { fakeRequest, getTestUsers } from "~/tests/utils"; const { deleteUsers, users } = await getTestUsers(1); diff --git a/plugins/openid/routes/oauth/sso.ts b/plugins/openid/routes/oauth/sso.ts index e0c6f874..49d409f2 100644 --- a/plugins/openid/routes/oauth/sso.ts +++ b/plugins/openid/routes/oauth/sso.ts @@ -7,7 +7,7 @@ import { generateRandomCodeVerifier, processDiscoveryResponse, } from "oauth4webapi"; -import { Application } from "~/packages/database-interface/application.ts"; +import { Application } from "~/classes/database/application.ts"; import type { PluginType } from "../../index.ts"; import { oauthRedirectUri } from "../../utils.ts"; diff --git a/plugins/openid/routes/oauth/token.test.ts b/plugins/openid/routes/oauth/token.test.ts index 3b41699a..2bdbbf0a 100644 --- a/plugins/openid/routes/oauth/token.test.ts +++ b/plugins/openid/routes/oauth/token.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeAll, describe, expect, test } from "bun:test"; import { db } from "@versia/kit/db"; import { eq } from "@versia/kit/drizzle"; import { Tokens } from "@versia/kit/tables"; -import { Application } from "~/packages/database-interface/application"; +import { Application } from "~/classes/database/application"; import { fakeRequest, getTestUsers } from "~/tests/utils"; const { deleteUsers, users } = await getTestUsers(1); diff --git a/plugins/openid/routes/oauth/token.ts b/plugins/openid/routes/oauth/token.ts index 5ffadffb..abdf86ae 100644 --- a/plugins/openid/routes/oauth/token.ts +++ b/plugins/openid/routes/oauth/token.ts @@ -3,7 +3,7 @@ import { createRoute, z } from "@hono/zod-openapi"; import { db } from "@versia/kit/db"; import { eq } from "@versia/kit/drizzle"; import { Tokens } from "@versia/kit/tables"; -import { Application } from "~/packages/database-interface/application.ts"; +import { Application } from "~/classes/database/application.ts"; import type { PluginType } from "../../index.ts"; export const schemas = { diff --git a/setup.ts b/setup.ts index fefe8280..2764bfa0 100644 --- a/setup.ts +++ b/setup.ts @@ -1,9 +1,9 @@ import { checkConfig } from "@/init"; import { configureLoggers } from "@/loggers"; import { getLogger } from "@logtape/logtape"; +import { Note } from "~/classes/database/note.ts"; import { setupDatabase } from "~/drizzle/db"; import { config } from "~/packages/config-manager/index.ts"; -import { Note } from "~/packages/database-interface/note"; import { searchManager } from "./classes/search/search-manager.ts"; const timeAtStart = performance.now(); diff --git a/tests/oauth-scopes.test.ts b/tests/oauth-scopes.test.ts index 03478fd1..116387d2 100644 --- a/tests/oauth-scopes.test.ts +++ b/tests/oauth-scopes.test.ts @@ -3,7 +3,7 @@ import { checkIfOauthIsValid } from "@/oauth"; import { Application, type ApplicationType, -} from "~/packages/database-interface/application"; +} from "~/classes/database/application"; describe("checkIfOauthIsValid", () => { it("should return true when routeScopes and application.scopes are empty", () => { diff --git a/tests/utils.ts b/tests/utils.ts index c0865042..18738aeb 100644 --- a/tests/utils.ts +++ b/tests/utils.ts @@ -3,14 +3,14 @@ import { randomString } from "@/math"; import { solveChallenge } from "altcha-lib"; import { asc, inArray, like } from "drizzle-orm"; import { appFactory } from "~/app"; +import { Note } from "~/classes/database/note"; +import { User } from "~/classes/database/user"; import type { Status } from "~/classes/functions/status"; import { searchManager } from "~/classes/search/search-manager"; import { db } from "~/drizzle/db"; import { setupDatabase } from "~/drizzle/db"; import { Notes, Tokens, Users } from "~/drizzle/schema"; import { config } from "~/packages/config-manager"; -import { Note } from "~/packages/database-interface/note"; -import { User } from "~/packages/database-interface/user"; await setupDatabase(); if (config.sonic.enabled) { diff --git a/types/api.ts b/types/api.ts index 907e78b3..3d6c98af 100644 --- a/types/api.ts +++ b/types/api.ts @@ -13,10 +13,10 @@ import type { } from "@versia/federation/types"; import type { SocketAddress } from "bun"; import { z } from "zod"; +import type { Application } from "~/classes/database/application"; +import type { User as DatabaseUser } from "~/classes/database/user"; import type { RolePermissions } from "~/drizzle/schema"; import type { Config } from "~/packages/config-manager"; -import type { Application } from "~/packages/database-interface/application"; -import type { User as DatabaseUser } from "~/packages/database-interface/user"; export type HttpVerb = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS"; export interface ApiRouteMetadata { diff --git a/utils/api.ts b/utils/api.ts index 4960c690..374975f5 100644 --- a/utils/api.ts +++ b/utils/api.ts @@ -22,12 +22,12 @@ import { import { parse } from "qs"; import type { z } from "zod"; import { fromZodError } from "zod-validation-error"; +import { Application } from "~/classes/database/application"; +import type { User } from "~/classes/database/user"; import { type AuthData, getFromHeader } from "~/classes/functions/user"; import { db } from "~/drizzle/db"; import { Challenges } from "~/drizzle/schema"; import { config } from "~/packages/config-manager/index.ts"; -import { Application } from "~/packages/database-interface/application"; -import type { User } from "~/packages/database-interface/user"; import type { ApiRouteMetadata, HonoEnv, HttpVerb } from "~/types/api"; export const applyConfig = (routeMeta: ApiRouteMetadata) => { diff --git a/utils/init.ts b/utils/init.ts index 4f3d17bf..3a1fa502 100644 --- a/utils/init.ts +++ b/utils/init.ts @@ -1,7 +1,7 @@ import { getLogger } from "@logtape/logtape"; import chalk from "chalk"; +import { User } from "~/classes/database/user"; import type { Config } from "~/packages/config-manager"; -import { User } from "~/packages/database-interface/user"; export const checkConfig = async (config: Config) => { await checkFederationConfig(config); diff --git a/utils/oauth.ts b/utils/oauth.ts index 95882d93..5a7f839c 100644 --- a/utils/oauth.ts +++ b/utils/oauth.ts @@ -1,4 +1,4 @@ -import type { Application } from "~/packages/database-interface/application"; +import type { Application } from "~/classes/database/application"; /** * Check if an OAuth application is valid for a route