Merge branch 'master' of https://github.com/fosscord/fosscord-api

1 files changed, 3 insertions, 2 deletions

diff --git a/util/src/entities/VoiceState.ts b/util/src/entities/VoiceState.ts

index d7a032c7..56eb244e 100644
--- a/util/src/entities/VoiceState.ts
+++ b/util/src/entities/VoiceState.ts
@@ -32,8 +32,9 @@ export class VoiceState extends BaseClass {
 	@ManyToOne(() => User)
 	user: User;
 
-	@JoinColumn({ name: "user_id" })
-	@ManyToOne(() => Member)
+	// @JoinColumn([{ name: "user_id", referencedColumnName: "id" },{ name: "guild_id", referencedColumnName: "guild_id" }])
+	// @ManyToOne(() => Member)
+	//TODO find a way to make it work without breaking Guild.voice_states
 	member: Member;
 
 	@Column()