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/Message.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index 8122b532..2b5e6f86 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -51,7 +51,7 @@ export class Message extends BaseClass {
 	@ManyToOne(() => Channel, {
 		onDelete: "CASCADE"
 	})
-	channel: Channel;
+	channel: Relation<Channel>;
 
 	@Column({ nullable: true })
 	@RelationId((message: Message) => message.guild)
@@ -61,7 +61,7 @@ export class Message extends BaseClass {
 	@ManyToOne(() => Guild, {
 		onDelete: "CASCADE"
 	})
-	guild?: Guild;
+	guild?: Relation<Guild>;
 
 	@Column({ nullable: true })
 	@RelationId((message: Message) => message.author)
@@ -72,7 +72,7 @@ export class Message extends BaseClass {
 	@ManyToOne(() => User, {
 		onDelete: "CASCADE"
 	})
-	author?: User;
+	author?: Relation<User>;
 
 	@Column({ nullable: true })
 	@RelationId((message: Message) => message.member)
@@ -82,7 +82,7 @@ export class Message extends BaseClass {
 	@ManyToOne(() => User, {
 		onDelete: "CASCADE"
 	})
-	member?: Member;
+	member?: Relation<Member>;
 
 	@Column({ nullable: true })
 	@RelationId((message: Message) => message.webhook)
@@ -90,7 +90,7 @@ export class Message extends BaseClass {
 
 	@JoinColumn({ name: "webhook_id" })
 	@ManyToOne(() => Webhook)
-	webhook?: Webhook;
+	webhook?: Relation<Webhook>;
 
 	@Column({ nullable: true })
 	@RelationId((message: Message) => message.application)
@@ -98,7 +98,7 @@ export class Message extends BaseClass {
 
 	@JoinColumn({ name: "application_id" })
 	@ManyToOne(() => Application)
-	application?: Application;
+	application?: Relation<Application>;
 
 	@Column({ nullable: true })
 	content?: string;
@@ -118,25 +118,25 @@ export class Message extends BaseClass {
 
 	@JoinTable({ name: "message_user_mentions" })
 	@ManyToMany(() => User)
-	mentions: User[];
+	mentions: Relation<User[]>;
 
 	@JoinTable({ name: "message_role_mentions" })
 	@ManyToMany(() => Role)
-	mention_roles: Role[];
+	mention_roles: Relation<Role[]>;
 
 	@JoinTable({ name: "message_channel_mentions" })
 	@ManyToMany(() => Channel)
-	mention_channels: Channel[];
+	mention_channels: Relation<Channel[]>;
 
 	@JoinTable({ name: "message_stickers" })
 	@ManyToMany(() => Sticker, { cascade: true, onDelete: "CASCADE" })
-	sticker_items?: Sticker[];
+	sticker_items?: Relation<Sticker[]>;
 
 	@OneToMany(() => Attachment, (attachment: Attachment) => attachment.message, {
 		cascade: true,
 		orphanedRowAction: "delete"
 	})
-	attachments?: Attachment[];
+	attachments?: Relation<Attachment[]>;
 
 	@Column({ type: "simple-json" })
 	embeds: Embed[];
@@ -170,7 +170,7 @@ export class Message extends BaseClass {
 
 	@JoinColumn({ name: "message_reference_id" })
 	@ManyToOne(() => Message)
-	referenced_message?: Message;
+	referenced_message?: Relation<Message>;
 
 	@Column({ type: "simple-json", nullable: true })
 	interaction?: {
-- 
cgit 1.5.1