From 2f94884d37dc9d8fce7ddf639b2470efc5162620 Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Mon, 4 Nov 2024 15:06:23 +0100
Subject: [PATCH] refactor(database): :recycle: Correctly use @versia/kit
 imports everywhere

---
 classes/database/instance.ts     |  3 +--
 classes/database/like.ts         |  4 +---
 classes/database/note.ts         | 14 +++++++++-----
 classes/database/relationship.ts |  3 +--
 classes/database/timeline.ts     |  4 +---
 classes/database/user.ts         | 17 ++++++++++-------
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/classes/database/instance.ts b/classes/database/instance.ts
index 7315a38d..446eda28 100644
--- a/classes/database/instance.ts
+++ b/classes/database/instance.ts
@@ -5,7 +5,7 @@ import {
     type ValidationError,
 } from "@versia/federation";
 import type { InstanceMetadata } from "@versia/federation/types";
-import { db } from "@versia/kit/db";
+import { User, db } from "@versia/kit/db";
 import { Instances } from "@versia/kit/tables";
 import chalk from "chalk";
 import {
@@ -18,7 +18,6 @@ import {
 } from "drizzle-orm";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
-import { User } from "./user.ts";
 
 type InstanceType = InferSelectModel<typeof Instances>;
 
diff --git a/classes/database/like.ts b/classes/database/like.ts
index 5759b2ac..3ca22634 100644
--- a/classes/database/like.ts
+++ b/classes/database/like.ts
@@ -1,6 +1,6 @@
 import { RolePermission } from "@versia/client/types";
 import type { Delete, LikeExtension } from "@versia/federation/types";
-import { db } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
 import {
     Likes,
     type Notes,
@@ -19,8 +19,6 @@ import {
 import { z } from "zod";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
-import { Note } from "./note.ts";
-import { User } from "./user.ts";
 
 type LikeType = InferSelectModel<typeof Likes> & {
     liker: InferSelectModel<typeof Users>;
diff --git a/classes/database/note.ts b/classes/database/note.ts
index 0cc6e3cd..b145d276 100644
--- a/classes/database/note.ts
+++ b/classes/database/note.ts
@@ -14,7 +14,15 @@ import type {
     Delete as VersiaDelete,
     Note as VersiaNote,
 } from "@versia/federation/types";
-import { type Instance, Notification, db } from "@versia/kit/db";
+import {
+    Application,
+    Attachment,
+    Emoji,
+    type Instance,
+    Notification,
+    User,
+    db,
+} from "@versia/kit/db";
 import {
     Attachments,
     EmojiToNote,
@@ -42,11 +50,7 @@ import {
     parseTextMentions,
 } from "~/classes/functions/status";
 import { config } from "~/packages/config-manager";
-import { Application } from "./application.ts";
-import { Attachment } from "./attachment.ts";
 import { BaseInterface } from "./base.ts";
-import { Emoji } from "./emoji.ts";
-import { User } from "./user.ts";
 
 type NoteType = InferSelectModel<typeof Notes>;
 
diff --git a/classes/database/relationship.ts b/classes/database/relationship.ts
index 5e5e4b8d..19e878d9 100644
--- a/classes/database/relationship.ts
+++ b/classes/database/relationship.ts
@@ -1,5 +1,5 @@
 import type { Relationship as APIRelationship } from "@versia/client/types";
-import { db } from "@versia/kit/db";
+import { type User, db } from "@versia/kit/db";
 import { Relationships } from "@versia/kit/tables";
 import {
     type InferInsertModel,
@@ -12,7 +12,6 @@ import {
 } from "drizzle-orm";
 import { z } from "zod";
 import { BaseInterface } from "./base.ts";
-import type { User } from "./user.ts";
 
 type RelationshipType = InferSelectModel<typeof Relationships>;
 
diff --git a/classes/database/timeline.ts b/classes/database/timeline.ts
index fca146e2..57c03c96 100644
--- a/classes/database/timeline.ts
+++ b/classes/database/timeline.ts
@@ -1,9 +1,7 @@
+import { Note, Notification, User } from "@versia/kit/db";
 import { Notes, Notifications, Users } from "@versia/kit/tables";
 import { type SQL, gt } from "drizzle-orm";
 import { config } from "~/packages/config-manager";
-import { Note } from "./note.ts";
-import { Notification } from "./notification.ts";
-import { User } from "./user.ts";
 
 enum TimelineType {
     Note = "Note",
diff --git a/classes/database/user.ts b/classes/database/user.ts
index 478af0d6..9a5856df 100644
--- a/classes/database/user.ts
+++ b/classes/database/user.ts
@@ -19,7 +19,16 @@ import type {
     Unfollow,
     User as VersiaUser,
 } from "@versia/federation/types";
-import { Notification, db } from "@versia/kit/db";
+import {
+    Emoji,
+    Instance,
+    Like,
+    type Note,
+    Notification,
+    Relationship,
+    Role,
+    db,
+} from "@versia/kit/db";
 import {
     EmojiToUser,
     Likes,
@@ -57,12 +66,6 @@ import { searchManager } from "~/classes/search/search-manager";
 import { type Config, config } from "~/packages/config-manager";
 import type { KnownEntity } from "~/types/api.ts";
 import { BaseInterface } from "./base.ts";
-import { Emoji } from "./emoji.ts";
-import { Instance } from "./instance.ts";
-import { Like } from "./like.ts";
-import type { Note } from "./note.ts";
-import { Relationship } from "./relationship.ts";
-import { Role } from "./role.ts";
 
 type UserWithInstance = InferSelectModel<typeof Users> & {
     instance: typeof Instance.$type | null;