refactor(database): 🚚 Only import ORM table data from @versia/kit

classes/database/application.ts

@@ -1,4 +1,6 @@
 import type { Application as APIApplication } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { Applications } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -8,8 +10,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Applications } from "~/drizzle/schema";
 import { BaseInterface } from "./base.ts";
 
 export type ApplicationType = InferSelectModel<typeof Applications>;

classes/database/attachment.ts

@@ -1,6 +1,8 @@
 import { proxyUrl } from "@/response";
 import type { Attachment as ApiAttachment } from "@versia/client/types";
 import type { ContentFormat } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Attachments } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -10,8 +12,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Attachments } from "~/drizzle/schema";
 import { MediaBackendType } from "~/packages/config-manager/config.type";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";

classes/database/emoji.ts

@@ -2,6 +2,8 @@ import { emojiValidatorWithColons, emojiValidatorWithIdentifiers } from "@/api";
 import { proxyUrl } from "@/response";
 import type { Emoji as ApiEmoji } from "@versia/client/types";
 import type { CustomEmojiExtension } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Emojis, Instances } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -12,8 +14,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Emojis, Instances } from "~/drizzle/schema";
 import { BaseInterface } from "./base.ts";
 import { Instance } from "./instance.ts";
 

classes/database/instance.ts

@@ -5,6 +5,8 @@ import {
     type ValidationError,
 } from "@versia/federation";
 import type { InstanceMetadata } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Instances } from "@versia/kit/tables";
 import chalk from "chalk";
 import {
     type InferInsertModel,
@@ -14,8 +16,6 @@ import {
     eq,
     inArray,
 } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Instances } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
 import { User } from "./user.ts";

classes/database/like.ts

@@ -1,5 +1,7 @@
 import { RolePermission } from "@versia/client/types";
 import type { Delete, LikeExtension } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Likes } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -9,8 +11,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Likes } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import type { Status } from "../functions/status.ts";
 import type { UserType } from "../functions/user.ts";

classes/database/note.ts

@@ -14,6 +14,15 @@ import type {
     Delete as VersiaDelete,
     Note as VersiaNote,
 } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import {
+    Attachments,
+    EmojiToNote,
+    NoteToMentions,
+    Notes,
+    Notifications,
+    Users,
+} from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type SQL,
@@ -33,15 +42,6 @@ import {
     findManyNotes,
     parseTextMentions,
 } from "~/classes/functions/status";
-import { db } from "~/drizzle/db";
-import {
-    Attachments,
-    EmojiToNote,
-    NoteToMentions,
-    Notes,
-    Notifications,
-    Users,
-} from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { Application } from "./application.ts";
 import { Attachment } from "./attachment.ts";

classes/database/relationship.ts

@@ -1,4 +1,6 @@
 import type { Relationship as APIRelationship } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { Relationships } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -9,8 +11,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Relationships } from "~/drizzle/schema";
 import { BaseInterface } from "./base.ts";
 import type { User } from "./user.ts";
 

classes/database/role.ts

@@ -1,5 +1,7 @@
 import { proxyUrl } from "@/response";
 import { RolePermission } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { RoleToUsers, Roles } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -10,8 +12,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { RoleToUsers, Roles } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
 

classes/database/timeline.ts

@@ -1,5 +1,5 @@
+import { Notes, Users } from "@versia/kit/tables";
 import { type SQL, gt } from "drizzle-orm";
-import { Notes, Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { Note } from "./note.ts";
 import { User } from "./user.ts";

classes/database/user.ts

@@ -19,6 +19,17 @@ import type {
     Unfollow,
     User as VersiaUser,
 } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import {
+    EmojiToUser,
+    Likes,
+    NoteToMentions,
+    Notes,
+    Notifications,
+    type RolePermissions,
+    UserToPinnedNotes,
+    Users,
+} from "@versia/kit/tables";
 import chalk from "chalk";
 import {
     type InferInsertModel,
@@ -43,17 +54,6 @@ import {
     followRequestToVersia,
 } from "~/classes/functions/user";
 import { searchManager } from "~/classes/search/search-manager";
-import { db } from "~/drizzle/db";
-import {
-    EmojiToUser,
-    Likes,
-    NoteToMentions,
-    Notes,
-    Notifications,
-    type RolePermissions,
-    UserToPinnedNotes,
-    Users,
-} from "~/drizzle/schema";
 import { type Config, config } from "~/packages/config-manager";
 import type { KnownEntity } from "~/types/api.ts";
 import { BaseInterface } from "./base.ts";

classes/functions/notification.ts

@@ -1,8 +1,7 @@
 import type { Notification as ApiNotification } from "@versia/client/types";
-import { Note, User } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
+import type { Notifications } from "@versia/kit/tables";
 import type { InferSelectModel } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import type { Notifications } from "~/drizzle/schema";
 import type { StatusWithRelations } from "./status.ts";
 import {
     type UserWithRelations,

classes/functions/status.ts

@@ -2,7 +2,13 @@ import { mentionValidator } from "@/api";
 import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization";
 import markdownItTaskLists from "@hackmd/markdown-it-task-lists";
 import type { ContentFormat } from "@versia/federation/types";
-import { User } from "@versia/kit/db";
+import { User, db } from "@versia/kit/db";
+import {
+    type Attachments,
+    Instances,
+    type Notes,
+    Users,
+} from "@versia/kit/tables";
 import {
     type InferSelectModel,
     and,
@@ -27,13 +33,6 @@ 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 { db } from "~/drizzle/db";
-import {
-    type Attachments,
-    Instances,
-    type Notes,
-    Users,
-} from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import {
     type UserWithInstance,

classes/functions/token.ts

@@ -1,5 +1,5 @@
+import type { Tokens } from "@versia/kit/tables";
 import type { InferSelectModel } from "drizzle-orm";
-import type { Tokens } from "~/drizzle/schema";
 
 /**
  * The type of token.

classes/functions/user.ts

@@ -3,18 +3,17 @@ import type {
     FollowAccept,
     FollowReject,
 } from "@versia/federation/types";
-import { User } from "@versia/kit/db";
-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 { db } from "~/drizzle/db";
+import { User, db } from "@versia/kit/db";
 import {
     Applications,
     type Instances,
     type Roles,
     Tokens,
     type Users,
-} from "~/drizzle/schema";
+} from "@versia/kit/tables";
+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 type { Token } from "./token.ts";
 
 export type UserType = InferSelectModel<typeof Users>;

classes/inbox/processor.test.ts

@@ -1,8 +1,7 @@
 import { beforeEach, describe, expect, jest, mock, test } from "bun:test";
 import { SignatureValidator } from "@versia/federation";
 import type { Entity, Note as VersiaNote } from "@versia/federation/types";
-import { Note, Relationship, User } from "@versia/kit/db";
-import { db } from "@versia/kit/db";
+import { Note, Relationship, User, db } from "@versia/kit/db";
 import type { Context } from "hono";
 import { ValidationError } from "zod-validation-error";
 import { config } from "~/packages/config-manager/index.ts";

classes/search/search-manager.ts

@@ -4,12 +4,11 @@
  */
 
 import { getLogger } from "@logtape/logtape";
-import { Note, User } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
 import {
     Ingest as SonicChannelIngest,
     Search as SonicChannelSearch,
 } from "sonic-channel";
-import { db } from "~/drizzle/db";
 import { type Config, config } from "~/packages/config-manager";
 
 /**