Use import type in entities where possible

src/util/entities/Application.ts

@@ -18,9 +18,9 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, OneToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { Team } from "./Team";
-import { User } from "./User";
-import { Guild } from "./Guild";
+import type { Guild } from "./Guild";
+import type { Team } from "./Team";
+import type { User } from "./User";
 
 @Entity({
     name: "applications",

src/util/entities/ApplicationCommand.ts

@@ -17,7 +17,6 @@
 */
 
 import { Column, Entity } from "typeorm";
-import { BaseClass } from "./BaseClass";
 import {
     ApplicationCommandHandlerType,
     ApplicationCommandOption,
@@ -27,6 +26,7 @@ import {
     ApplicationIntegrationType,
     InteractionContextType,
 } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
 
 @Entity({
     name: "application_commands",

src/util/entities/Attachment.ts

@@ -18,8 +18,9 @@
 
 import { BeforeRemove, Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { deleteFile } from "../util";
-import { BaseClass } from "./BaseClass";
 import { getUrlSignature, NewUrlUserSignatureData, NewUrlSignatureData } from "../Signing";
+import { BaseClass } from "./BaseClass";
+import type { Message } from "./Message";
 
 @Entity({
     name: "attachments",
@@ -51,10 +52,10 @@ export class Attachment extends BaseClass {
     message_id: string;
 
     @JoinColumn({ name: "message_id" })
-    @ManyToOne(() => require("./Message").Message, (message: import("./Message").Message) => message.attachments, {
+    @ManyToOne(() => require("./Message").Message, (message: Message) => message.attachments, {
         onDelete: "CASCADE",
     })
-    message: import("./Message").Message;
+    message: Message;
 
     @BeforeRemove()
     onDelete() {

src/util/entities/AuditLog.ts

@@ -17,9 +17,9 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { User } from "./User";
 import { AuditLogChange, AuditLogEvents } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { User } from "./User";
 
 @Entity({
     name: "audit_logs",

src/util/entities/AutomodRule.ts

@@ -16,10 +16,10 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BaseClass } from "./BaseClass";
 import { Entity, JoinColumn, ManyToOne, Column } from "typeorm";
-import { User } from "./User";
 import { AutomodAction, AutomodRuleEventType, AutomodRuleTriggerMetadata, AutomodRuleTriggerType } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { User } from "./User";
 
 @Entity({
     name: "automod_rules",

src/util/entities/BackupCodes.ts

@@ -17,10 +17,10 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { User } from "./User";
 import crypto from "crypto";
 import { Config } from "../util";
+import { BaseClass } from "./BaseClass";
+import type { User } from "./User";
 
 @Entity({
     name: "backup_codes",

src/util/entities/Ban.ts

@@ -18,8 +18,8 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
-import { User } from "./User";
+import type { Guild } from "./Guild";
+import type { User } from "./User";
 
 @Entity({
     name: "bans",

src/util/entities/Channel.ts

@@ -21,19 +21,19 @@ import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "ty
 import { DmChannelDTO } from "../dtos";
 import { ChannelCreateEvent, ChannelRecipientRemoveEvent, ThreadCreateEvent, ThreadMembersUpdateEvent } from "../interfaces";
 import { InvisibleCharacters, Snowflake, emitEvent, getPermission, trimSpecial, Permissions, Config, DiscordApiErrors } from "../util";
-import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
-import { Invite } from "./Invite";
-import { Message } from "./Message";
-import { Tag } from "./Tag";
-import { ReadState } from "./ReadState";
-import { Recipient } from "./Recipient";
-import { User } from "./User";
-import { VoiceState } from "./VoiceState";
-import { Webhook } from "./Webhook";
-import { Member } from "./Member";
 import { ChannelPermissionOverwrite, ChannelType, PublicUserProjection, ThreadMetadata } from "@spacebar/schemas";
 import { OrmUtils } from "../imports";
+import { BaseClass } from "./BaseClass";
+import { Guild } from "./Guild";
+import type { Invite } from "./Invite";
+import type { Message } from "./Message";
+import type { Tag } from "./Tag";
+import type { ReadState } from "./ReadState";
+import { Recipient } from "./Recipient";
+import { User } from "./User";
+import type { VoiceState } from "./VoiceState";
+import type { Webhook } from "./Webhook";
+import { Member } from "./Member";
 import { ThreadMember } from "./ThreadMember";
 
 @Entity({

src/util/entities/CloudAttachment.ts

@@ -18,8 +18,8 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { User } from "./User";
-import { Channel } from "./Channel";
+import type { User } from "./User";
+import type { Channel } from "./Channel";
 
 @Entity({
     name: "cloud_attachments",

src/util/entities/ConnectedAccount.ts

@@ -17,9 +17,9 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { User } from "./User";
 import { ConnectedAccountTokenData } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { User } from "./User";
 
 @Entity({
     name: "connected_accounts",

src/util/entities/EmbedCache.ts

@@ -16,9 +16,9 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BaseClass } from "./BaseClass";
 import { Entity, Column } from "typeorm";
 import { Embed } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
 
 @Entity({
     name: "embed_cache",

src/util/entities/Emoji.ts

@@ -17,9 +17,9 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { User } from "./User";
 import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
+import type { User } from "./User";
+import type { Guild } from "./Guild";
 
 @Entity({
     name: "emojis",

src/util/entities/Guild.ts

@@ -18,19 +18,19 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm";
 import { Config, GuildWelcomeScreen, Snowflake, handleFile } from "..";
-import { Ban } from "./Ban";
+import { arrayRemove } from "@spacebar/util";
 import { BaseClass } from "./BaseClass";
+import type { Ban } from "./Ban";
 import { Channel } from "./Channel";
-import { Emoji } from "./Emoji";
-import { Invite } from "./Invite";
+import type { Emoji } from "./Emoji";
+import type { Invite } from "./Invite";
 import { Member } from "./Member";
 import { Role } from "./Role";
-import { Sticker } from "./Sticker";
-import { Template } from "./Template";
-import { User } from "./User";
-import { VoiceState } from "./VoiceState";
-import { Webhook } from "./Webhook";
-import { arrayRemove } from "@spacebar/util";
+import type { Sticker } from "./Sticker";
+import type { Template } from "./Template";
+import type { User } from "./User";
+import type { VoiceState } from "./VoiceState";
+import type { Webhook } from "./Webhook";
 // TODO: application_command_count, application_command_counts: {1: 0, 2: 0, 3: 0}
 // TODO: guild_scheduled_events
 // TODO: stage_instances

src/util/entities/Invite.ts

@@ -18,10 +18,10 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
-import { Channel } from "./Channel";
-import { Guild } from "./Guild";
+import type { Channel } from "./Channel";
+import type { Guild } from "./Guild";
 import { Member } from "./Member";
-import { User } from "./User";
+import type { User } from "./User";
 
 export const PublicInviteRelation = ["inviter", "guild", "channel"];
 

src/util/entities/Member.ts

@@ -21,14 +21,14 @@ import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, JoinTabl
 import { ReadyGuildDTO } from "../dtos";
 import { GuildCreateEvent, GuildDeleteEvent, GuildMemberAddEvent, GuildMemberRemoveEvent, GuildMemberUpdateEvent, MessageCreateEvent } from "../interfaces";
 import { Config, emitEvent, DiscordApiErrors } from "../util";
-import { Ban } from "./Ban";
+import { AvatarDecorationData, Collectibles, DisplayNameStyle, PublicMember, PublicMemberProjection, UserGuildSettings } from "@spacebar/schemas";
 import { BaseClassWithoutId } from "./BaseClass";
+import { Ban } from "./Ban";
 import { Channel } from "./Channel";
 import { Guild, PublicGuildRelations } from "./Guild";
 import { Message } from "./Message";
 import { Role } from "./Role";
 import { User } from "./User";
-import { AvatarDecorationData, Collectibles, DisplayNameStyle, PublicMember, PublicMemberProjection, UserGuildSettings } from "@spacebar/schemas";
 
 export const MemberPrivateProjection: (keyof Member)[] = [
     "id",

src/util/entities/Message.ts

@@ -16,22 +16,22 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { User } from "./User";
-import { Member } from "./Member";
-import { Role } from "./Role";
-import { Channel } from "./Channel";
-import { InteractionType } from "../interfaces";
-import { Application } from "./Application";
 import { Column, CreateDateColumn, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, RelationId, FindOneOptions, Raw, Not, BaseEntity, In } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
-import { Webhook } from "./Webhook";
-import { Sticker } from "./Sticker";
-import { Attachment } from "./Attachment";
 import { NewUrlUserSignatureData } from "../Signing";
 import { ActionRowComponent, ApplicationCommandType, Embed, MessageSnapshot, MessageType, PartialMessage, Poll, Reaction } from "@spacebar/schemas";
 import { MessageFlags } from "@spacebar/util";
 import { JsonRemoveEmpty } from "../util/Decorators";
+import { InteractionType } from "../interfaces";
+import { BaseClass } from "./BaseClass";
+import { User } from "./User";
+import { Member } from "./Member";
+import type { Role } from "./Role";
+import { Channel } from "./Channel";
+import type { Application } from "./Application";
+import { Guild } from "./Guild";
+import type { Webhook } from "./Webhook";
+import type { Sticker } from "./Sticker";
+import { Attachment } from "./Attachment";
 
 @Entity({
     name: "messages",

src/util/entities/Note.ts

@@ -18,7 +18,7 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, Unique } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { User } from "./User";
+import type { User } from "./User";
 
 @Entity({
     name: "notes",

src/util/entities/ReadState.ts

@@ -17,10 +17,10 @@
 */
 
 import { Column, Entity, Index, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { Channel } from "./Channel";
-import { User } from "./User";
 import { ReadStateFlags, ReadStateType } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { Channel } from "./Channel";
+import type { User } from "./User";
 
 // for read receipts
 // notification cursor and public read receipt need to be forwards-only (the former to prevent re-pinging when marked as unread, and the latter to be acceptable as a legal acknowledgement in criminal proceedings), and private read marker needs to be advance-rewind capable

src/util/entities/Recipient.ts

@@ -18,6 +18,8 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
+import type { Channel } from "./Channel";
+import type { User } from "./User";
 
 @Entity({
     name: "recipients",
@@ -31,7 +33,7 @@ export class Recipient extends BaseClass {
     @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
-    channel: import("./Channel").Channel;
+    channel: Channel;
 
     @Column()
     @RelationId((recipient: Recipient) => recipient.user)
@@ -41,7 +43,7 @@ export class Recipient extends BaseClass {
     @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
-    user: import("./User").User;
+    user: User;
 
     @Column({ default: false })
     closed: boolean;

src/util/entities/Relationship.ts

@@ -17,9 +17,9 @@
 */
 
 import { Column, Entity, Index, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { User } from "./User";
 import { RelationshipType } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { User } from "./User";
 
 @Entity({
     name: "relationships",

src/util/entities/ReportMenu.ts

@@ -16,9 +16,9 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BaseClass } from "./BaseClass";
 import { Entity, Column } from "typeorm";
 import { ReportMenuType } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
 
 @Entity({
     name: "report_menus",

src/util/entities/Role.ts

@@ -18,9 +18,9 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 
-import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
 import { RoleColors } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { Guild } from "./Guild";
 
 @Entity({
     name: "roles",

src/util/entities/SecurityKey.ts

@@ -18,7 +18,7 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { User } from "./User";
+import type { User } from "./User";
 
 @Entity({
     name: "security_keys",

src/util/entities/Session.ts

@@ -17,12 +17,12 @@
 */
 
 import crypto from "crypto";
-import { User } from "./User";
-import { BaseClassWithoutId } from "./BaseClass";
 import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn, RelationId } from "typeorm";
 import { Activity, ClientStatus, GatewaySession, GatewaySessionClientInfo, Status } from "../interfaces";
 import { randomUpperString } from "@spacebar/api";
 import { DateBuilder, IpDataClient, TimeSpan } from "../util";
+import { BaseClassWithoutId } from "./BaseClass";
+import type { User } from "./User";
 
 @Entity({
     name: "sessions",

src/util/entities/Sticker.ts

@@ -17,10 +17,11 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
-import { User } from "./User";
 import { StickerFormatType, StickerType } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { Guild } from "./Guild";
+import type { User } from "./User";
+import type { StickerPack } from "./StickerPack";
 
 @Entity({
     name: "stickers",
@@ -47,7 +48,7 @@ export class Sticker extends BaseClass {
         onDelete: "CASCADE",
         nullable: true,
     })
-    pack: import("./StickerPack").StickerPack;
+    pack: StickerPack;
 
     @Column({ nullable: true })
     guild_id?: string;

src/util/entities/StickerPack.ts

@@ -17,8 +17,8 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm";
-import { Sticker } from "./Sticker";
 import { BaseClass } from "./BaseClass";
+import type { Sticker } from "./Sticker";
 
 @Entity({
     name: "sticker_packs",

src/util/entities/Stream.ts

@@ -1,7 +1,7 @@
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { User } from "./User";
-import { Channel } from "./Channel";
+import type { User } from "./User";
+import type { Channel } from "./Channel";
 
 @Entity({
     name: "streams",

src/util/entities/StreamSession.ts

@@ -1,7 +1,7 @@
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { User } from "./User";
-import { Stream } from "./Stream";
+import type { User } from "./User";
+import type { Stream } from "./Stream";
 
 @Entity({
     name: "stream_sessions",

src/util/entities/Tag.ts

@@ -18,7 +18,7 @@
 
 import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { Channel } from "./Channel";
+import type { Channel } from "./Channel";
 
 @Entity({
     name: "tags",

src/util/entities/Team.ts

@@ -18,8 +18,8 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { TeamMember } from "./TeamMember";
-import { User } from "./User";
+import type { TeamMember } from "./TeamMember";
+import type { User } from "./User";
 
 @Entity({
     name: "teams",

src/util/entities/TeamMember.ts

@@ -17,9 +17,10 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { User } from "./User";
 import { TeamMemberRole, TeamMemberState } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { User } from "./User";
+import type { Team } from "./Team";
 
 @Entity({
     name: "team_members",
@@ -39,10 +40,10 @@ export class TeamMember extends BaseClass {
     team_id: string;
 
     @JoinColumn({ name: "team_id" })
-    @ManyToOne(() => require("./Team").Team, (team: import("./Team").Team) => team.members, {
+    @ManyToOne(() => require("./Team").Team, (team: Team) => team.members, {
         onDelete: "CASCADE",
     })
-    team: import("./Team").Team;
+    team: Team;
 
     @Column({ nullable: true })
     @RelationId((member: TeamMember) => member.user)

src/util/entities/Template.ts

@@ -18,8 +18,8 @@
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
-import { User } from "./User";
+import type { Guild } from "./Guild";
+import type { User } from "./User";
 
 @Entity({
     name: "templates",

src/util/entities/ThreadMember.ts

@@ -17,12 +17,12 @@
 */
 
 import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn, RelationId } from "typeorm";
+import { HTTPError } from "lambert-server";
 import { ThreadMembersUpdateEvent } from "../interfaces";
 import { emitEvent } from "../util";
 import { BaseClassWithoutId } from "./BaseClass";
 import { Channel } from "./Channel";
-import { HTTPError } from "lambert-server";
-import { Member } from "./Member";
+import type { Member } from "./Member";
 
 // TODO: move
 interface ThreadMemberMuteConfig {

src/util/entities/User.ts

@@ -20,14 +20,6 @@ import { Request } from "express";
 import { Column, Entity, JoinColumn, OneToMany, OneToOne } from "typeorm";
 import { Config, Email, FieldErrors, Snowflake, trimSpecial } from "..";
 import { Random } from "../util";
-import { BaseClass } from "./BaseClass";
-import { Channel } from "./Channel";
-import { ConnectedAccount } from "./ConnectedAccount";
-import { Member } from "./Member";
-import { Relationship } from "./Relationship";
-import { SecurityKey } from "./SecurityKey";
-import { Session } from "./Session";
-import { UserSettings } from "./UserSettings";
 import {
     AvatarDecorationData,
     ChannelType,
@@ -40,6 +32,14 @@ import {
     UserPrivate,
 } from "@spacebar/schemas";
 import { JsonNumber } from "../util/Decorators";
+import { BaseClass } from "./BaseClass";
+import { Channel } from "./Channel";
+import type { ConnectedAccount } from "./ConnectedAccount";
+import { Member } from "./Member";
+import type { Relationship } from "./Relationship";
+import type { SecurityKey } from "./SecurityKey";
+import type { Session } from "./Session";
+import { UserSettings } from "./UserSettings";
 
 @Entity({
     name: "users",
@@ -144,7 +144,7 @@ export class User extends BaseClass {
     @JsonNumber
     rights: string;
 
-    @OneToMany(() => Session, (session: Session) => session.user)
+    @OneToMany(() => require("./Session").Session, (session: Session) => session.user)
     sessions: Session[];
 
     @JoinColumn({ name: "relationship_ids" })

src/util/entities/UserSettings.ts

@@ -17,8 +17,8 @@
 */
 
 import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
-import { BaseClassWithoutId } from "./BaseClass";
 import { CustomStatus, FriendSourceFlags, GuildFolder } from "@spacebar/schemas";
+import { BaseClassWithoutId } from "./BaseClass";
 
 @Entity({
     name: "user_settings",

src/util/entities/UserSettingsProtos.ts

@@ -17,9 +17,9 @@
 */
 
 import { Column, Entity, JoinColumn, OneToOne } from "typeorm";
+import { FrecencyUserSettings, PreloadedUserSettings } from "discord-protos";
 import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
 import { User } from "./User";
-import { FrecencyUserSettings, PreloadedUserSettings } from "discord-protos";
 
 @Entity({
     name: "user_settings_protos",

src/util/entities/VoiceState.ts

@@ -17,12 +17,12 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { BaseClass } from "./BaseClass";
-import { Channel } from "./Channel";
-import { Guild } from "./Guild";
-import { Member } from "./Member";
-import { User } from "./User";
 import { PublicVoiceState, PublicVoiceStateProjection } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { Channel } from "./Channel";
+import type { Guild } from "./Guild";
+import type { Member } from "./Member";
+import type { User } from "./User";
 
 //https://gist.github.com/vassjozsef/e482c65df6ee1facaace8b3c9ff66145#file-voice_state-ex
 @Entity({

src/util/entities/Webhook.ts

@@ -17,12 +17,12 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { Application } from "./Application";
-import { BaseClass } from "./BaseClass";
-import { Channel } from "./Channel";
-import { Guild } from "./Guild";
-import { User } from "./User";
 import { WebhookType } from "@spacebar/schemas";
+import { BaseClass } from "./BaseClass";
+import type { Application } from "./Application";
+import type { Channel } from "./Channel";
+import type { Guild } from "./Guild";
+import type { User } from "./User";
 
 @Entity({
     name: "webhooks",