Try to make entity imports in entities lazy, didnt yet resolve circular imports...

src/util/entities/Application.ts

@@ -54,7 +54,7 @@ export class Application extends BaseClass {
     verify_key: string;
 
     @JoinColumn({ name: "owner_id" })
-    @ManyToOne(() => User, { onDelete: "CASCADE" })
+    @ManyToOne(() => require("./User").User, { onDelete: "CASCADE" })
     owner: User;
 
     // TODO: enum this? https://discord.com/developers/docs/resources/application#application-object-application-flags
@@ -89,7 +89,7 @@ export class Application extends BaseClass {
     discovery_eligibility_flags: number = 2240;
 
     @JoinColumn({ name: "bot_user_id" })
-    @OneToOne(() => User, { onDelete: "CASCADE" })
+    @OneToOne(() => require("./User").User, { onDelete: "CASCADE" })
     bot?: User;
 
     @Column({ type: "simple-array", nullable: true })
@@ -112,7 +112,7 @@ export class Application extends BaseClass {
     guild_id?: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild)
+    @ManyToOne(() => require("./Guild").Guild)
     guild?: Guild; // guild to which the app is linked, e.g. a developer support server
 
     @Column({ nullable: true })
@@ -130,7 +130,7 @@ export class Application extends BaseClass {
     //slug?: string; // if this application is a game sold, this field will be the URL slug that links to the store page
 
     @JoinColumn({ name: "team_id" })
-    @ManyToOne(() => Team, {
+    @ManyToOne(() => require("./Team").Team, {
         onDelete: "CASCADE",
         nullable: true,
     })

src/util/entities/AuditLog.ts

@@ -26,7 +26,7 @@ import { AuditLogChange, AuditLogEvents } from "@spacebar/schemas";
 })
 export class AuditLog extends BaseClass {
     @JoinColumn({ name: "target_id" })
-    @ManyToOne(() => User)
+    @ManyToOne(() => require("./User").User)
     target?: User;
 
     @Column({ nullable: true })
@@ -34,7 +34,7 @@ export class AuditLog extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, (user: User) => user.id)
+    @ManyToOne(() => require("./User").User, (user: User) => user.id)
     user: User;
 
     @Column({ type: "int" })

src/util/entities/AutomodRule.ts

@@ -26,7 +26,7 @@ import { AutomodAction, AutomodRuleEventType, AutomodRuleTriggerMetadata, Automo
 })
 export class AutomodRule extends BaseClass {
     @JoinColumn({ name: "creator_id" })
-    @ManyToOne(() => User, { onDelete: "CASCADE" })
+    @ManyToOne(() => require("./User").User, { onDelete: "CASCADE" })
     creator: User;
 
     @Column()

src/util/entities/BackupCodes.ts

@@ -27,7 +27,7 @@ import { Config } from "../util";
 })
 export class BackupCode extends BaseClass {
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, { onDelete: "CASCADE" })
+    @ManyToOne(() => require("./User").User, { onDelete: "CASCADE" })
     user: User;
 
     @Column()

src/util/entities/Ban.ts

@@ -30,7 +30,7 @@ export class Ban extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;
@@ -40,7 +40,7 @@ export class Ban extends BaseClass {
     guild_id: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, {
+    @ManyToOne(() => require("./Guild").Guild, {
         onDelete: "CASCADE",
     })
     guild: Guild;
@@ -50,7 +50,7 @@ export class Ban extends BaseClass {
     executor_id: string;
 
     @JoinColumn({ name: "executor_id" })
-    @ManyToOne(() => User)
+    @ManyToOne(() => require("./User").User)
     executor: User;
 
     @Column({ nullable: true })

src/util/entities/Channel.ts

@@ -52,13 +52,13 @@ export class Channel extends BaseClass {
     @Column({ type: "int" })
     type: ChannelType;
 
-    @OneToMany(() => Recipient, (recipient: Recipient) => recipient.channel, {
+    @OneToMany(() => require("./Recipient").Recipient, (recipient: Recipient) => recipient.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })
     recipients?: Recipient[];
 
-    @OneToMany(() => ThreadMember, (member: ThreadMember) => member.channel, {
+    @OneToMany(() => require("./ThreadMember").ThreadMember, (member: ThreadMember) => member.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -72,7 +72,7 @@ export class Channel extends BaseClass {
     guild_id?: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, (guild) => guild.channels, {
+    @ManyToOne(() => require("./Guild").Guild, (guild: Guild) => guild.channels, {
         onDelete: "CASCADE",
         nullable: true,
     })
@@ -83,7 +83,7 @@ export class Channel extends BaseClass {
     parent_id: string | null;
 
     @JoinColumn({ name: "parent_id" })
-    @ManyToOne(() => Channel)
+    @ManyToOne(() => require("./Channel").Channel)
     parent?: Channel;
 
     // for group DMs and owned custom channel types
@@ -92,7 +92,7 @@ export class Channel extends BaseClass {
     owner_id?: string;
 
     @JoinColumn({ name: "owner_id" })
-    @ManyToOne(() => User)
+    @ManyToOne(() => require("./User").User)
     owner: User;
 
     @Column({ nullable: true, type: "timestamp with time zone" })
@@ -122,7 +122,7 @@ export class Channel extends BaseClass {
     @Column({ nullable: true })
     topic?: string;
 
-    @OneToMany(() => Invite, (invite: Invite) => invite.channel, {
+    @OneToMany(() => require("./Invite").Invite, (invite: Invite) => invite.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -131,25 +131,25 @@ export class Channel extends BaseClass {
     @Column({ nullable: true })
     retention_policy_id?: string;
 
-    @OneToMany(() => Message, (message: Message) => message.channel, {
+    @OneToMany(() => require("./Message").Message, (message: Message) => message.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })
     messages?: Message[];
 
-    @OneToMany(() => VoiceState, (voice_state: VoiceState) => voice_state.channel, {
+    @OneToMany(() => require("./VoiceState").VoiceState, (voice_state: VoiceState) => voice_state.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })
     voice_states?: VoiceState[];
 
-    @OneToMany(() => ReadState, (read_state: ReadState) => read_state.channel, {
+    @OneToMany(() => require("./ReadState").ReadState, (read_state: ReadState) => read_state.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })
     read_states?: ReadState[];
 
-    @OneToMany(() => Webhook, (webhook: Webhook) => webhook.channel, {
+    @OneToMany(() => require("./Webhook").Webhook, (webhook: Webhook) => webhook.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -174,7 +174,7 @@ export class Channel extends BaseClass {
     total_message_sent?: number;
 
     @JoinColumn({ name: "available_tags_ids" })
-    @OneToMany(() => Tag, (tag: Tag) => tag.channel, {
+    @OneToMany(() => require("./Tag").Tag, (tag: Tag) => tag.channel, {
         cascade: true,
         orphanedRowAction: "delete",
     })

src/util/entities/CloudAttachment.ts

@@ -31,7 +31,7 @@ export class CloudAttachment extends BaseClass {
     userId: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, { nullable: true, onDelete: "SET NULL" })
+    @ManyToOne(() => require("./User").User, { nullable: true, onDelete: "SET NULL" })
     user?: User;
 
     @Column({ name: "channel_id", nullable: true })
@@ -39,7 +39,7 @@ export class CloudAttachment extends BaseClass {
     channelId?: string; // channel the file is uploaded to
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, { nullable: true, onDelete: "SET NULL" })
+    @ManyToOne(() => require("./Channel").Channel, { nullable: true, onDelete: "SET NULL" })
     channel?: Channel; // channel the file is uploaded to
 
     @Column({ name: "upload_filename" })

src/util/entities/ConnectedAccount.ts

@@ -33,7 +33,7 @@ export class ConnectedAccount extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;

src/util/entities/Emoji.ts

@@ -35,7 +35,7 @@ export class Emoji extends BaseClass {
     guild_id: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, (guild) => guild.emojis, {
+    @ManyToOne(() => require("./Guild").Guild, (guild: Guild) => guild.emojis, {
         onDelete: "CASCADE",
     })
     guild: Guild;
@@ -45,7 +45,7 @@ export class Emoji extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User)
+    @ManyToOne(() => require("./User").User)
     user: User;
 
     @Column()

src/util/entities/Guild.ts

@@ -68,7 +68,7 @@ export class Guild extends BaseClass {
     afk_channel_id?: string | null;
 
     @JoinColumn({ name: "afk_channel_id" })
-    @ManyToOne(() => Channel)
+    @ManyToOne(() => require("./Channel").Channel)
     afk_channel?: Channel;
 
     @Column({ nullable: true })
@@ -80,7 +80,7 @@ export class Guild extends BaseClass {
     // application?: string;
 
     @JoinColumn({ name: "ban_ids" })
-    @OneToMany(() => Ban, (ban: Ban) => ban.guild, {
+    @OneToMany(() => require("./Ban").Ban, (ban: Ban) => ban.guild, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -129,7 +129,7 @@ export class Guild extends BaseClass {
     @Column({ nullable: true })
     presence_count?: number; // users online
 
-    @OneToMany(() => Member, (member: Member) => member.guild, {
+    @OneToMany(() => require("./Member").Member, (member: Member) => member.guild, {
         cascade: true,
         orphanedRowAction: "delete",
         onDelete: "CASCADE",
@@ -137,7 +137,7 @@ export class Guild extends BaseClass {
     members: Member[];
 
     @JoinColumn({ name: "role_ids" })
-    @OneToMany(() => Role, (role: Role) => role.guild, {
+    @OneToMany(() => require("./Role").Role, (role: Role) => role.guild, {
         cascade: true,
         orphanedRowAction: "delete",
         onDelete: "CASCADE",
@@ -145,7 +145,7 @@ export class Guild extends BaseClass {
     roles: Role[];
 
     @JoinColumn({ name: "channel_ids" })
-    @OneToMany(() => Channel, (channel: Channel) => channel.guild, {
+    @OneToMany(() => require("./Channel").Channel, (channel: Channel) => channel.guild, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -156,11 +156,11 @@ export class Guild extends BaseClass {
     template_id?: string;
 
     @JoinColumn({ name: "template_id", referencedColumnName: "id" })
-    @ManyToOne(() => Template)
+    @ManyToOne(() => require("./Template").Template)
     template: Template;
 
     @JoinColumn({ name: "emoji_ids" })
-    @OneToMany(() => Emoji, (emoji: Emoji) => emoji.guild, {
+    @OneToMany(() => require("./Emoji").Emoji, (emoji: Emoji) => emoji.guild, {
         cascade: true,
         orphanedRowAction: "delete",
         onDelete: "CASCADE",
@@ -168,7 +168,7 @@ export class Guild extends BaseClass {
     emojis: Emoji[];
 
     @JoinColumn({ name: "sticker_ids" })
-    @OneToMany(() => Sticker, (sticker: Sticker) => sticker.guild, {
+    @OneToMany(() => require("./Sticker").Sticker, (sticker: Sticker) => sticker.guild, {
         cascade: true,
         orphanedRowAction: "delete",
         onDelete: "CASCADE",
@@ -176,7 +176,7 @@ export class Guild extends BaseClass {
     stickers: Sticker[];
 
     @JoinColumn({ name: "invite_ids" })
-    @OneToMany(() => Invite, (invite: Invite) => invite.guild, {
+    @OneToMany(() => require("./Invite").Invite, (invite: Invite) => invite.guild, {
         cascade: true,
         orphanedRowAction: "delete",
         onDelete: "CASCADE",
@@ -184,7 +184,7 @@ export class Guild extends BaseClass {
     invites: Invite[];
 
     @JoinColumn({ name: "voice_state_ids" })
-    @OneToMany(() => VoiceState, (voicestate: VoiceState) => voicestate.guild, {
+    @OneToMany(() => require("./VoiceState").VoiceState, (voicestate: VoiceState) => voicestate.guild, {
         cascade: true,
         orphanedRowAction: "delete",
         onDelete: "CASCADE",
@@ -192,7 +192,7 @@ export class Guild extends BaseClass {
     voice_states: VoiceState[];
 
     @JoinColumn({ name: "webhook_ids" })
-    @OneToMany(() => Webhook, (webhook: Webhook) => webhook.guild, {
+    @OneToMany(() => require("./Webhook").Webhook, (webhook: Webhook) => webhook.guild, {
         cascade: true,
         orphanedRowAction: "delete",
         onDelete: "CASCADE",
@@ -210,7 +210,7 @@ export class Guild extends BaseClass {
     owner_id?: string; // optional to allow for ownerless guilds
 
     @JoinColumn({ name: "owner_id", referencedColumnName: "id" })
-    @ManyToOne(() => User)
+    @ManyToOne(() => require("./User").User)
     owner?: User; // optional to allow for ownerless guilds
 
     @Column({ nullable: true })
@@ -227,7 +227,7 @@ export class Guild extends BaseClass {
     public_updates_channel_id: string | null;
 
     @JoinColumn({ name: "public_updates_channel_id" })
-    @ManyToOne(() => Channel)
+    @ManyToOne(() => require("./Channel").Channel)
     public_updates_channel?: Channel;
 
     @Column({ type: String, nullable: true })
@@ -235,7 +235,7 @@ export class Guild extends BaseClass {
     rules_channel_id?: string | null;
 
     @JoinColumn({ name: "rules_channel_id" })
-    @ManyToOne(() => Channel)
+    @ManyToOne(() => require("./Channel").Channel)
     rules_channel?: string;
 
     @Column({ nullable: true })
@@ -249,7 +249,7 @@ export class Guild extends BaseClass {
     system_channel_id?: string | null;
 
     @JoinColumn({ name: "system_channel_id" })
-    @ManyToOne(() => Channel)
+    @ManyToOne(() => require("./Channel").Channel)
     system_channel?: Channel;
 
     @Column({ nullable: true })
@@ -272,7 +272,7 @@ export class Guild extends BaseClass {
     widget_channel_id?: string;
 
     @JoinColumn({ name: "widget_channel_id" })
-    @ManyToOne(() => Channel)
+    @ManyToOne(() => require("./Channel").Channel)
     widget_channel?: Channel;
 
     @Column()

src/util/entities/InstanceBan.ts

@@ -52,7 +52,7 @@ export class InstanceBan extends BaseClass {
     origin_instance_ban_id?: string;
 
     @JoinColumn({ name: "origin_instance_ban_id" })
-    @OneToOne(() => InstanceBan, { nullable: true, onDelete: "SET NULL" })
+    @OneToOne(() => require("./InstanceBan").InstanceBan, { nullable: true, onDelete: "SET NULL" })
     origin_instance_ban?: InstanceBan;
 
     static async findInstanceBans(opts: { userId?: string; ipAddress?: string; fingerprint?: string; propagateBan?: boolean }) {

src/util/entities/Invite.ts

@@ -55,7 +55,7 @@ export class Invite extends BaseClassWithoutId {
     guild_id: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, (guild) => guild.invites, {
+    @ManyToOne(() => require("./Guild").Guild, (guild: Guild) => guild.invites, {
         onDelete: "CASCADE",
     })
     guild: Guild;
@@ -65,7 +65,7 @@ export class Invite extends BaseClassWithoutId {
     channel_id: string;
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     channel: Channel;
@@ -75,7 +75,7 @@ export class Invite extends BaseClassWithoutId {
     inviter_id?: string;
 
     @JoinColumn({ name: "inviter_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     inviter: User;
@@ -85,7 +85,7 @@ export class Invite extends BaseClassWithoutId {
     target_user_id: string;
 
     @JoinColumn({ name: "target_user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     target_user?: string; // could be used for "User specific invites" https://github.com/spacebarchat/server/issues/326

src/util/entities/Member.ts

@@ -66,7 +66,7 @@ export class Member extends BaseClassWithoutId {
     id: string;
 
     @JoinColumn({ name: "id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;
@@ -76,7 +76,7 @@ export class Member extends BaseClassWithoutId {
     guild_id: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, {
+    @ManyToOne(() => require("./Guild").Guild, {
         onDelete: "CASCADE",
     })
     guild: Guild;
@@ -92,7 +92,7 @@ export class Member extends BaseClassWithoutId {
             referencedColumnName: "id",
         },
     })
-    @ManyToMany(() => Role, { cascade: true })
+    @ManyToMany(() => require("./Role").Role, { cascade: true })
     roles: Role[];
 
     @Column()

src/util/entities/Message.ts

@@ -44,7 +44,7 @@ export class Message extends BaseClass {
     channel_id?: string;
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     channel: Channel;
@@ -54,7 +54,7 @@ export class Message extends BaseClass {
     thread_id?: string;
 
     @JoinColumn({ name: "thread_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     thread?: Channel;
@@ -64,7 +64,7 @@ export class Message extends BaseClass {
     guild_id?: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, {
+    @ManyToOne(() => require("./Guild").Guild, {
         onDelete: "CASCADE",
     })
     guild?: Guild;
@@ -75,7 +75,7 @@ export class Message extends BaseClass {
     author_id?: string;
 
     @JoinColumn({ name: "author_id", referencedColumnName: "id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     author?: User;
@@ -85,7 +85,7 @@ export class Message extends BaseClass {
     member_id?: string;
 
     @JoinColumn({ name: "member_id", referencedColumnName: "id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     member?: Member;
@@ -95,7 +95,7 @@ export class Message extends BaseClass {
     webhook_id?: string;
 
     @JoinColumn({ name: "webhook_id" })
-    @ManyToOne(() => Webhook)
+    @ManyToOne(() => require("./Webhook").Webhook)
     webhook?: Webhook;
 
     @Column({ nullable: true })
@@ -103,7 +103,7 @@ export class Message extends BaseClass {
     application_id?: string;
 
     @JoinColumn({ name: "application_id" })
-    @ManyToOne(() => Application)
+    @ManyToOne(() => require("./Application").Application)
     application?: Application;
 
     @Column({ nullable: true })
@@ -124,24 +124,24 @@ export class Message extends BaseClass {
 
     @JoinTable({ name: "message_user_mentions" })
     @JsonRemoveEmpty
-    @ManyToMany(() => User)
+    @ManyToMany(() => require("./User").User)
     mentions: User[];
 
     @JoinTable({ name: "message_role_mentions" })
     @JsonRemoveEmpty
-    @ManyToMany(() => Role)
+    @ManyToMany(() => require("./Role").Role)
     mention_roles: Role[];
 
     @JoinTable({ name: "message_channel_mentions" })
     @JsonRemoveEmpty
-    @ManyToMany(() => Channel)
+    @ManyToMany(() => require("./Channel").Channel)
     mention_channels: Channel[];
 
     @JoinTable({ name: "message_stickers" })
-    @ManyToMany(() => Sticker, { cascade: true, onDelete: "CASCADE" })
+    @ManyToMany(() => require("./Sticker").Sticker, { cascade: true, onDelete: "CASCADE" })
     sticker_items?: Sticker[];
 
-    @OneToMany(() => Attachment, (attachment: Attachment) => attachment.message, {
+    @OneToMany(() => require("./Attachment").Attachment, (attachment: Attachment) => attachment.message, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -187,7 +187,7 @@ export class Message extends BaseClass {
     };
 
     @JoinColumn({ name: "message_reference_id" })
-    @ManyToOne(() => Message, { onDelete: "SET NULL" })
+    @ManyToOne(() => require("./Message").Message, { onDelete: "SET NULL" })
     referenced_message?: Message | null;
 
     @Column({ type: "simple-json", nullable: true })

src/util/entities/Note.ts

@@ -26,11 +26,11 @@ import { User } from "./User";
 @Unique(["owner", "target"])
 export class Note extends BaseClass {
     @JoinColumn({ name: "owner_id" })
-    @ManyToOne(() => User, { onDelete: "CASCADE" })
+    @ManyToOne(() => require("./User").User, { onDelete: "CASCADE" })
     owner: User;
 
     @JoinColumn({ name: "target_id" })
-    @ManyToOne(() => User, { onDelete: "CASCADE" })
+    @ManyToOne(() => require("./User").User, { onDelete: "CASCADE" })
     target: User;
 
     @Column()

src/util/entities/ReadState.ts

@@ -36,7 +36,7 @@ export class ReadState extends BaseClass {
     channel_id: string;
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     channel: Channel;
@@ -46,7 +46,7 @@ export class ReadState extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;

src/util/entities/Relationship.ts

@@ -31,7 +31,7 @@ export class Relationship extends BaseClass {
     from_id: string;
 
     @JoinColumn({ name: "from_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     from: User;
@@ -41,7 +41,7 @@ export class Relationship extends BaseClass {
     to_id: string;
 
     @JoinColumn({ name: "to_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     to: User;

src/util/entities/Role.ts

@@ -31,7 +31,7 @@ export class Role extends BaseClass {
     guild_id: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, (guild) => guild.roles, {
+    @ManyToOne(() => require("./Guild").Guild, (guild: Guild) => guild.roles, {
         onDelete: "CASCADE",
     })
     guild: Guild;

src/util/entities/SecurityKey.ts

@@ -29,7 +29,7 @@ export class SecurityKey extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;

src/util/entities/Session.ts

@@ -37,7 +37,7 @@ export class Session extends BaseClassWithoutId {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;

src/util/entities/Sticker.ts

@@ -53,7 +53,7 @@ export class Sticker extends BaseClass {
     guild_id?: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, (guild) => guild.stickers, {
+    @ManyToOne(() => require("./Guild").Guild, (guild: Guild) => guild.stickers, {
         onDelete: "CASCADE",
     })
     guild?: Guild;
@@ -62,7 +62,7 @@ export class Sticker extends BaseClass {
     user_id?: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user?: User;

src/util/entities/StickerPack.ts

@@ -33,7 +33,7 @@ export class StickerPack extends BaseClass {
     @Column({ nullable: true })
     banner_asset_id?: string;
 
-    @OneToMany(() => Sticker, (sticker: Sticker) => sticker.pack, {
+    @OneToMany(() => require("./Sticker").Sticker, (sticker: Sticker) => sticker.pack, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -45,7 +45,7 @@ export class StickerPack extends BaseClass {
     @RelationId((pack: StickerPack) => pack.cover_sticker)
     cover_sticker_id?: string;
 
-    @ManyToOne(() => Sticker, { nullable: true })
+    @ManyToOne(() => require("./Sticker").Sticker, { nullable: true })
     @JoinColumn()
     cover_sticker?: Sticker;
 }

src/util/entities/Stream.ts

@@ -12,7 +12,7 @@ export class Stream extends BaseClass {
     owner_id: string;
 
     @JoinColumn({ name: "owner_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     owner: User;
@@ -22,7 +22,7 @@ export class Stream extends BaseClass {
     channel_id: string;
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     channel: Channel;

src/util/entities/StreamSession.ts

@@ -12,7 +12,7 @@ export class StreamSession extends BaseClass {
     stream_id: string;
 
     @JoinColumn({ name: "stream_id" })
-    @ManyToOne(() => Stream, {
+    @ManyToOne(() => require("./Stream").Stream, {
         onDelete: "CASCADE",
     })
     stream: Stream;
@@ -22,7 +22,7 @@ export class StreamSession extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;

src/util/entities/Tag.ts

@@ -28,7 +28,7 @@ export class Tag extends BaseClass {
     channel_id: string;
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, (channel) => channel.available_tags, {
+    @ManyToOne(() => require("./Channel").Channel, (channel: Channel) => channel.available_tags, {
         onDelete: "CASCADE",
     })
     channel: Channel;

src/util/entities/Team.ts

@@ -29,7 +29,7 @@ export class Team extends BaseClass {
     icon?: string;
 
     @JoinColumn({ name: "member_ids" })
-    @OneToMany(() => TeamMember, (member: TeamMember) => member.team, {
+    @OneToMany(() => require("./TeamMember").TeamMember, (member: TeamMember) => member.team, {
         orphanedRowAction: "delete",
     })
     members: TeamMember[];
@@ -42,6 +42,6 @@ export class Team extends BaseClass {
     owner_user_id: string;
 
     @JoinColumn({ name: "owner_user_id" })
-    @ManyToOne(() => User)
+    @ManyToOne(() => require("./User").User)
     owner_user: User;
 }

src/util/entities/TeamMember.ts

@@ -49,7 +49,7 @@ export class TeamMember extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;

src/util/entities/Template.ts

@@ -42,7 +42,7 @@ export class Template extends BaseClass {
     creator_id: string;
 
     @JoinColumn({ name: "creator_id" })
-    @ManyToOne(() => User)
+    @ManyToOne(() => require("./User").User)
     creator: User;
 
     @Column()
@@ -56,7 +56,7 @@ export class Template extends BaseClass {
     source_guild_id: string;
 
     @JoinColumn({ name: "source_guild_id" })
-    @ManyToOne(() => Guild, { onDelete: "CASCADE" })
+    @ManyToOne(() => require("./Guild").Guild, { onDelete: "CASCADE" })
     source_guild: Guild;
 
     @Column({ type: "simple-json" })

src/util/entities/ThreadMember.ts

@@ -50,7 +50,7 @@ export class ThreadMember extends BaseClassWithoutId {
     id: string;
 
     @JoinColumn({ name: "id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     channel: Channel;
@@ -60,7 +60,7 @@ export class ThreadMember extends BaseClassWithoutId {
     member_idx: string;
 
     @JoinColumn({ name: "member_idx" })
-    @ManyToOne(() => Member, {
+    @ManyToOne(() => require("./Member").Member, {
         onDelete: "CASCADE",
     })
     member: Member;

src/util/entities/User.ts

@@ -148,14 +148,14 @@ export class User extends BaseClass {
     sessions: Session[];
 
     @JoinColumn({ name: "relationship_ids" })
-    @OneToMany(() => Relationship, (relationship: Relationship) => relationship.from, {
+    @OneToMany(() => require("./Relationship").Relationship, (relationship: Relationship) => relationship.from, {
         cascade: true,
         orphanedRowAction: "delete",
     })
     relationships: Relationship[];
 
     @JoinColumn({ name: "connected_account_ids" })
-    @OneToMany(() => ConnectedAccount, (account: ConnectedAccount) => account.user, {
+    @OneToMany(() => require("./ConnectedAccount").ConnectedAccount, (account: ConnectedAccount) => account.user, {
         cascade: true,
         orphanedRowAction: "delete",
     })
@@ -170,7 +170,7 @@ export class User extends BaseClass {
     @Column({ type: "simple-array", select: false })
     fingerprints: string[] = []; // array of fingerprints -> used to prevent multiple accounts
 
-    @OneToOne(() => UserSettings, {
+    @OneToOne(() => require("./UserSettings").UserSettings, {
         cascade: true,
         orphanedRowAction: "delete",
         nullable: true,
@@ -178,7 +178,7 @@ export class User extends BaseClass {
     @JoinColumn()
     settings?: UserSettings;
 
-    @OneToMany(() => SecurityKey, (key: SecurityKey) => key.user)
+    @OneToMany(() => require("./SecurityKey").SecurityKey, (key: SecurityKey) => key.user)
     security_keys: SecurityKey[];
 
     @Column({ type: "simple-array", nullable: true })

src/util/entities/UserSettingsProtos.ts

@@ -25,7 +25,7 @@ import { FrecencyUserSettings, PreloadedUserSettings } from "discord-protos";
     name: "user_settings_protos",
 })
 export class UserSettingsProtos extends BaseClassWithoutId {
-    @OneToOne(() => User, {
+    @OneToOne(() => require("./User").User, {
         cascade: true,
         orphanedRowAction: "delete",
         eager: false,

src/util/entities/VoiceState.ts

@@ -34,7 +34,7 @@ export class VoiceState extends BaseClass {
     guild_id: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, (guild) => guild.voice_states, {
+    @ManyToOne(() => require("./Guild").Guild, (guild: Guild) => guild.voice_states, {
         onDelete: "CASCADE",
     })
     guild?: Guild;
@@ -44,7 +44,7 @@ export class VoiceState extends BaseClass {
     channel_id: string;
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     channel: Channel;
@@ -54,7 +54,7 @@ export class VoiceState extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;

src/util/entities/Webhook.ts

@@ -45,7 +45,7 @@ export class Webhook extends BaseClass {
     guild_id?: string;
 
     @JoinColumn({ name: "guild_id" })
-    @ManyToOne(() => Guild, {
+    @ManyToOne(() => require("./Guild").Guild, {
         onDelete: "CASCADE",
     })
     guild?: Guild;
@@ -55,7 +55,7 @@ export class Webhook extends BaseClass {
     channel_id: string;
 
     @JoinColumn({ name: "channel_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     channel: Channel;
@@ -65,7 +65,7 @@ export class Webhook extends BaseClass {
     application_id: string;
 
     @JoinColumn({ name: "application_id" })
-    @ManyToOne(() => Application, {
+    @ManyToOne(() => require("./Application").Application, {
         onDelete: "CASCADE",
     })
     application: Application;
@@ -75,7 +75,7 @@ export class Webhook extends BaseClass {
     user_id: string;
 
     @JoinColumn({ name: "user_id" })
-    @ManyToOne(() => User, {
+    @ManyToOne(() => require("./User").User, {
         onDelete: "CASCADE",
     })
     user: User;
@@ -85,7 +85,7 @@ export class Webhook extends BaseClass {
     source_guild_id?: string;
 
     @JoinColumn({ name: "source_guild_id" })
-    @ManyToOne(() => Guild, {
+    @ManyToOne(() => require("./Guild").Guild, {
         onDelete: "CASCADE",
     })
     source_guild?: Guild;
@@ -95,7 +95,7 @@ export class Webhook extends BaseClass {
     source_channel_id: string;
 
     @JoinColumn({ name: "source_channel_id" })
-    @ManyToOne(() => Channel, {
+    @ManyToOne(() => require("./Channel").Channel, {
         onDelete: "CASCADE",
     })
     source_channel: Channel;