Merge pull request #232 from Pan-nav/master

More bug fixes
flytegg · Feb 17, 2024 · 8f9dc38 · 8f9dc38
2 parents 4db1eba + 87ab60c
commit 8f9dc38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.env.example b/.env.example
@@ -21,6 +21,8 @@ NEWS_CHANNEL_ID=
 COUNTING_CHANNEL_ID=
 VOICE_CHANNEL_ID=
 
+CHAT_CATEGORY=
+
 STUDENT_ROLE_ID=
 SUPPORT_ROLE_ID=
 STAFF_ROLE_ID=

diff --git a/src/main/kotlin/com/learnspigot/bot/voicechat/VCListener.kt b/src/main/kotlin/com/learnspigot/bot/voicechat/VCListener.kt
@@ -1,23 +1,23 @@
 package com.learnspigot.bot.voicechat
 
+import com.learnspigot.bot.Environment
 import io.github.cdimascio.dotenv.dotenv
-import net.dv8tion.jda.api.entities.channel.unions.AudioChannelUnion
+import net.dv8tion.jda.api.entities.Widget.VoiceChannel
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent
 import net.dv8tion.jda.api.hooks.ListenerAdapter
 
 class VCListener : ListenerAdapter() {
-
     override fun onGuildVoiceUpdate(event: GuildVoiceUpdateEvent){
         val guild = event.guild
-        val voiceChannel = guild.getVoiceChannelById(dotenv().get("VOICE_CHANNEL_ID"))
-        val joinedChannel: AudioChannelUnion? = event.channelJoined
+        val voiceChannel = guild.getVoiceChannelById(Environment.get("VOICE_CHANNEL_ID"))
+        val joinedChannel = event.channelJoined
         val leftChannel = event.channelLeft
-
         val oldChannel = event.oldValue
 
-        if (joinedChannel != null && joinedChannel == voiceChannel){
+        if (joinedChannel !is VoiceChannel || joinedChannel.parentCategoryId != Environment.get("CHAT_CATEGORY")) return
+        if (joinedChannel == voiceChannel){
 
-            if (oldChannel != null && oldChannel.members.isEmpty()){
+            if ((oldChannel != null) && oldChannel.members.isEmpty()){
                 oldChannel.delete().queue()
             }
 
@@ -31,5 +31,6 @@ class VCListener : ListenerAdapter() {
                 leftChannel.delete().queue()
             }
         }
+
     }
 }