refactor(database): 🚚 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

@@ -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";
 

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

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";
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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";
 

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

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";
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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<typeof Likes>;
 

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,

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,

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<typeof Users>;

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

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<T extends typeof Command> = Interfaces.InferredFlags<

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<typeof EmojiAdd> {
     static override args = {

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

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

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

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

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<typeof UserCreate> {
     static override args = {

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<typeof UserList> {
     static override args = {};

packages/plugin-kit/exports/db.ts

@@ -1,10 +1,10 @@
 // biome-ignore lint/performance/noBarrelFile: <explanation>
-export { User } from "~/packages/database-interface/user";
+export { User } from "~/classes/database/user";
-export { Role } from "~/packages/database-interface/role";
+export { Role } from "~/classes/database/role";
-export { Attachment } from "~/packages/database-interface/attachment";
+export { Attachment } from "~/classes/database/attachment";
-export { Emoji } from "~/packages/database-interface/emoji";
+export { Emoji } from "~/classes/database/emoji";
-export { Instance } from "~/packages/database-interface/instance";
+export { Instance } from "~/classes/database/instance";
-export { Note } from "~/packages/database-interface/note";
+export { Note } from "~/classes/database/note";
-export { Timeline } from "~/packages/database-interface/timeline";
+export { Timeline } from "~/classes/database/timeline";
-export { Application } from "~/packages/database-interface/application";
+export { Application } from "~/classes/database/application";
 export { db } from "~/drizzle/db";

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

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

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

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