From c77d00e243f7cf104b8b0f8b26f339849dbd040f Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 11 Jun 2026 22:16:07 +0200
Subject: Move entities to database

---
 src/api/util/handlers/Instance.ts     |  3 ++-
 src/api/util/handlers/Message.ts      | 15 +--------------
 src/api/util/handlers/Webhook.ts      |  5 +++--
 src/api/util/utility/EmbedHandlers.ts |  7 ++++---
 4 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'src/api/util')

diff --git a/src/api/util/handlers/Instance.ts b/src/api/util/handlers/Instance.ts
index f899d07d..52d241aa 100644
--- a/src/api/util/handlers/Instance.ts
+++ b/src/api/util/handlers/Instance.ts
@@ -16,7 +16,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Session, TimeSpan } from "@spacebar/util";
+import { Session } from "@spacebar/database";
+import { TimeSpan } from "@spacebar/util";
 import { setInterval } from "node:timers";
 
 export async function initInstance() {
diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 4e6d7316..65d41e43 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -19,13 +19,9 @@
 import { HTTPError } from "lambert-server/HTTPError";
 import { Equal, In, Or } from "typeorm";
 import { fillMessageUrlEmbeds, randomString } from "@spacebar/api";
-import { getDatabase } from "@spacebar/database";
+import { getDatabase, Application, Attachment, Channel, CloudAttachment, Guild, Member, Message, ReadState, Role, Session, Sticker, User, Webhook } from "@spacebar/database";
 import { mathLogBase, arrayDistributeSequentially } from "@spacebar/extensions";
 import {
-    Application,
-    Attachment,
-    Channel,
-    CloudAttachment,
     Config,
     DiscordApiErrors,
     emitEvent,
@@ -33,27 +29,18 @@ import {
     FieldErrors,
     getPermission,
     getRights,
-    Guild,
     handleFile,
     HERE_MENTION,
-    Member,
-    Message,
     MessageCreateEvent,
     MessageFlags,
     Permissions,
-    ReadState,
-    Role,
     ROLE_MENTION,
-    Session,
     Snowflake,
-    Sticker,
     Stopwatch,
     TraceNode,
     TraceRoot,
     TraceSubTree,
-    User,
     USER_MENTION,
-    Webhook,
 } from "@spacebar/util";
 import {
     ActionRowComponent,
diff --git a/src/api/util/handlers/Webhook.ts b/src/api/util/handlers/Webhook.ts
index 48032c8f..02fe6690 100644
--- a/src/api/util/handlers/Webhook.ts
+++ b/src/api/util/handlers/Webhook.ts
@@ -1,8 +1,9 @@
-import { handleMessage, postHandleMessage } from "@spacebar/api";
-import { Attachment, Channel, Config, DiscordApiErrors, emitEvent, FieldErrors, Message, MessageCreateEvent, Snowflake, uploadFile, ValidateName, Webhook } from "@spacebar/util";
 import { Request, Response } from "express";
 import { HTTPError } from "lambert-server/HTTPError";
 import { MoreThan } from "typeorm";
+import { handleMessage, postHandleMessage } from "@spacebar/api";
+import { Attachment, Channel, Message, Webhook } from "@spacebar/database";
+import { Config, DiscordApiErrors, emitEvent, FieldErrors, MessageCreateEvent, Snowflake, uploadFile, ValidateName } from "@spacebar/util";
 import { WebhookExecuteSchema } from "@spacebar/schemas";
 
 export const executeWebhook = async (req: Request, res: Response) => {
diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts
index fa3d74f0..c18e4f79 100644
--- a/src/api/util/utility/EmbedHandlers.ts
+++ b/src/api/util/utility/EmbedHandlers.ts
@@ -16,14 +16,15 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { sleep, arrayDistinctBy, arrayGroupBy } from "@spacebar/extensions";
-import { Config, EmbedCache, emitEvent, Message, MessageUpdateEvent, normalizeUrl, OrmUtils } from "@spacebar/util";
-import { Embed, EmbedImage, EmbedType } from "@spacebar/schemas";
 import * as cheerio from "cheerio";
 import crypto from "node:crypto";
 import { yellow } from "picocolors";
 import probe from "probe-image-size";
 import { FindOptionsWhere, In } from "typeorm";
+import { EmbedCache, Message } from "@spacebar/database";
+import { sleep, arrayDistinctBy, arrayGroupBy } from "@spacebar/extensions";
+import { Config, emitEvent, MessageUpdateEvent, normalizeUrl, OrmUtils } from "@spacebar/util";
+import { Embed, EmbedImage, EmbedType } from "@spacebar/schemas";
 
 export function getDefaultFetchOptions(): RequestInit {
     return {
-- 
cgit 1.5.1