From feca7a5d620362d028c8f31353b0c996693697e3 Mon Sep 17 00:00:00 2001
From: TheArcaneBrony <myrainbowdash949@gmail.com>
Date: Sat, 27 Aug 2022 07:07:05 +0200
Subject: Merge 'webrtc' into 'dev/staging_webrtc'

---
 src/util/entities/Channel.ts | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'src/util/entities/Channel.ts')

diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts
index b17fdba0..17a077ba 100644
--- a/src/util/entities/Channel.ts
+++ b/src/util/entities/Channel.ts
@@ -56,7 +56,7 @@ export class Channel extends BaseClass {
 		cascade: true,
 		orphanedRowAction: "delete"
 	})
-	recipients?: Recipient[];
+	recipients?: Relation<Recipient[]>;
 
 	@Column({ nullable: true })
 	last_message_id: string;
@@ -69,7 +69,7 @@ export class Channel extends BaseClass {
 	@ManyToOne(() => Guild, {
 		onDelete: "CASCADE"
 	})
-	guild: Guild;
+	guild: Relation<Guild>;
 
 	@Column({ nullable: true })
 	@RelationId((channel: Channel) => channel.parent)
@@ -77,7 +77,7 @@ export class Channel extends BaseClass {
 
 	@JoinColumn({ name: "parent_id" })
 	@ManyToOne(() => Channel)
-	parent?: Channel;
+	parent?: Relation<Channel>;
 
 	// for group DMs and owned custom channel types
 	@Column({ nullable: true })
@@ -86,7 +86,7 @@ export class Channel extends BaseClass {
 
 	@JoinColumn({ name: "owner_id" })
 	@ManyToOne(() => User)
-	owner: User;
+	owner: Relation<User>;
 
 	@Column({ nullable: true })
 	last_pin_timestamp?: number;
@@ -112,9 +112,6 @@ export class Channel extends BaseClass {
 	@Column({ nullable: true })
 	nsfw?: boolean;
 
-	@Column({ nullable: true })
-	rate_limit_per_user?: number;
-
 	@Column({ nullable: true })
 	topic?: string;
 
@@ -122,7 +119,7 @@ export class Channel extends BaseClass {
 		cascade: true,
 		orphanedRowAction: "delete"
 	})
-	invites?: Invite[];
+	invites?: Relation<Invite[]>;
 
 	@Column({ nullable: true })
 	retention_policy_id?: string;
@@ -131,25 +128,25 @@ export class Channel extends BaseClass {
 		cascade: true,
 		orphanedRowAction: "delete"
 	})
-	messages?: Message[];
+	messages?: Relation<Message[]>;
 
 	@OneToMany(() => VoiceState, (voice_state: VoiceState) => voice_state.channel, {
 		cascade: true,
 		orphanedRowAction: "delete"
 	})
-	voice_states?: VoiceState[];
+	voice_states?: Relation<VoiceState[]>;
 
 	@OneToMany(() => ReadState, (read_state: ReadState) => read_state.channel, {
 		cascade: true,
 		orphanedRowAction: "delete"
 	})
-	read_states?: ReadState[];
+	read_states?: Relation<ReadState[]>;
 
 	@OneToMany(() => Webhook, (webhook: Webhook) => webhook.channel, {
 		cascade: true,
 		orphanedRowAction: "delete"
 	})
-	webhooks?: Webhook[];
+	webhooks?: Relation<Webhook[]>;
 
 	@Column({ nullable: true })
 	flags?: number = 0;
-- 
cgit 1.5.1