summary refs log tree commit diff
path: root/util/src
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-09-03 20:01:42 +0200
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-09-03 20:01:42 +0200
commitc95cd06dac7a38b07bea88211ef26efc1f4b80e5 (patch)
treef888f71a7115cbfc5c082a34de9ac811ecce02e7 /util/src
parent:zap: improve invite generation (diff)
parentMerge pull request #314 from AlTech98/master (diff)
downloadserver-c95cd06dac7a38b07bea88211ef26efc1f4b80e5.tar.xz
Merge branch 'master' of https://github.com/fosscord/fosscord-api
Diffstat (limited to 'util/src')
-rw-r--r--util/src/entities/VoiceState.ts5
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()