From 6e0f571b353769e70580b0d78344495f65c8dc25 Mon Sep 17 00:00:00 2001 From: Rory& Date: Tue, 16 Jun 2026 02:47:03 +0200 Subject: Signify some imports more explicitly --- src/database/entities/Attachment.ts | 6 +++--- src/database/entities/BackupCodes.ts | 2 +- src/database/entities/BaseClass.ts | 4 ++-- src/database/entities/Channel.ts | 2 +- src/database/entities/Member.ts | 2 +- src/database/entities/Message.ts | 2 +- src/database/entities/ReportMenu.ts | 2 +- src/database/entities/ThreadMember.ts | 2 +- src/database/entities/User.ts | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/database/entities') diff --git a/src/database/entities/Attachment.ts b/src/database/entities/Attachment.ts index b9756bf7..9631e74b 100644 --- a/src/database/entities/Attachment.ts +++ b/src/database/entities/Attachment.ts @@ -17,10 +17,10 @@ */ import { BeforeRemove, Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { Config, deleteFile } from "../../util/util"; +import { Config, deleteFile } from "@spacebar/util/util"; +import { getUrlSignature, NewUrlUserSignatureData, NewUrlSignatureData } from "@spacebar/util/Signing"; +import { PublicAttachment } from "@spacebar/schemas/api/messages/Attachments"; import { BaseClass } from "./BaseClass"; -import { getUrlSignature, NewUrlUserSignatureData, NewUrlSignatureData } from "../../util/Signing"; -import { PublicAttachment } from "../../schemas/api/messages/Attachments"; @Entity({ name: "attachments", diff --git a/src/database/entities/BackupCodes.ts b/src/database/entities/BackupCodes.ts index 88fe932e..47dfc454 100644 --- a/src/database/entities/BackupCodes.ts +++ b/src/database/entities/BackupCodes.ts @@ -20,7 +20,7 @@ import { Column, Entity, JoinColumn, ManyToOne } from "typeorm"; import { BaseClass } from "./BaseClass"; import { User } from "./User"; import crypto from "node:crypto"; -import { Config } from "../../util/util"; +import { Config } from "@spacebar/util/util"; @Entity({ name: "backup_codes", diff --git a/src/database/entities/BaseClass.ts b/src/database/entities/BaseClass.ts index 770c96e8..730a769f 100644 --- a/src/database/entities/BaseClass.ts +++ b/src/database/entities/BaseClass.ts @@ -18,9 +18,9 @@ import { BaseEntity, BeforeInsert, BeforeUpdate, FindOptionsWhere, PrimaryColumn } from "typeorm"; import { getDatabase } from "../Database"; -import { Snowflake } from "../../util/util/Snowflake"; +import { Snowflake } from "@spacebar/util/util/Snowflake"; import { OrmUtils } from "../../util/imports/OrmUtils"; -import { annotationsKey } from "../../util/util/Decorators"; +import { annotationsKey } from "@spacebar/util/util/Decorators"; export class BaseClassWithoutId extends BaseEntity { private get construct() { diff --git a/src/database/entities/Channel.ts b/src/database/entities/Channel.ts index 1543d20b..85ffcd8a 100644 --- a/src/database/entities/Channel.ts +++ b/src/database/entities/Channel.ts @@ -20,7 +20,7 @@ import { HTTPError } from "lambert-server/HTTPError"; import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm"; import { DmChannelDTO } from "../../util/dtos"; import { ChannelCreateEvent, ChannelRecipientRemoveEvent, ThreadCreateEvent, ThreadMembersUpdateEvent } from "../../util/interfaces"; -import { InvisibleCharacters, Snowflake, emitEvent, getPermission, Permissions, Config, DiscordApiErrors } from "../../util/util"; +import { InvisibleCharacters, Snowflake, emitEvent, getPermission, Permissions, Config, DiscordApiErrors } from "@spacebar/util/util"; import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; import { Invite } from "./Invite"; diff --git a/src/database/entities/Member.ts b/src/database/entities/Member.ts index e8e18660..75f38f88 100644 --- a/src/database/entities/Member.ts +++ b/src/database/entities/Member.ts @@ -21,7 +21,7 @@ import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, JoinTabl import { Ban, Channel, PublicGuildRelations } from "./index"; import { ReadyGuildDTO } from "../../util/dtos"; import { GuildCreateEvent, GuildDeleteEvent, GuildMemberAddEvent, GuildMemberRemoveEvent, GuildMemberUpdateEvent, MessageCreateEvent } from "../../util/interfaces"; -import { Config, emitEvent, DiscordApiErrors } from "../../util/util"; +import { Config, emitEvent, DiscordApiErrors } from "@spacebar/util/util"; import { BaseClassWithoutId } from "./BaseClass"; import { Guild } from "./Guild"; import { Message } from "./Message"; diff --git a/src/database/entities/Message.ts b/src/database/entities/Message.ts index 31e6a0e4..edcce494 100644 --- a/src/database/entities/Message.ts +++ b/src/database/entities/Message.ts @@ -44,7 +44,7 @@ import { InteractionType, } from "@spacebar/schemas"; import { MessageFlags } from "@spacebar/util"; -import { JsonRemoveEmpty } from "../../util/util/Decorators"; +import { JsonRemoveEmpty } from "@spacebar/util/util/Decorators"; @Entity({ name: "messages", diff --git a/src/database/entities/ReportMenu.ts b/src/database/entities/ReportMenu.ts index a37ae159..8a4909d7 100644 --- a/src/database/entities/ReportMenu.ts +++ b/src/database/entities/ReportMenu.ts @@ -18,7 +18,7 @@ import { BaseClass } from "./BaseClass"; import { Entity, Column } from "typeorm"; -import { ReportMenuType } from "../../schemas/api/reports/ReportMenu"; +import { ReportMenuType } from "@spacebar/schemas/api/reports/ReportMenu"; @Entity({ name: "report_menus", diff --git a/src/database/entities/ThreadMember.ts b/src/database/entities/ThreadMember.ts index fdda4eea..52729dd9 100644 --- a/src/database/entities/ThreadMember.ts +++ b/src/database/entities/ThreadMember.ts @@ -18,7 +18,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn, RelationId } from "typeorm"; import { ThreadMembersUpdateEvent } from "../../util/interfaces"; -import { emitEvent } from "../../util/util"; +import { emitEvent } from "@spacebar/util/util"; import { BaseClassWithoutId } from "./BaseClass"; import { Channel } from "./Channel"; import { HTTPError } from "lambert-server/HTTPError"; diff --git a/src/database/entities/User.ts b/src/database/entities/User.ts index 434f1630..59128a35 100644 --- a/src/database/entities/User.ts +++ b/src/database/entities/User.ts @@ -39,7 +39,7 @@ import { PublicUserProjection, UserPrivate, } from "@spacebar/schemas"; -import { JsonNumber } from "../../util/util/Decorators"; +import { JsonNumber } from "@spacebar/util/util/Decorators"; @Entity({ name: "users", -- cgit 1.5.1