FInally solved bot not leaving voice channel

BlitzOffline · Mar 3, 2022 · 966a8a6 · 966a8a6
1 parent 102b7e8
commit 966a8a6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/src/main/kotlin/com/blitzoffline/alphamusic/audio/AudioHandler.kt b/src/main/kotlin/com/blitzoffline/alphamusic/audio/AudioHandler.kt
@@ -55,7 +55,7 @@ class AudioHandler(private val bot: AlphaMusic, private val player: AudioPlayer,
         if (player.startTrack(queue.poll(), false)) {
             return bot.taskManager.removeLeaveTask(guildId)
         }
-        bot.taskManager.addLeaveTask(bot.jda.guilds.first { it.id == guildId })
+        bot.taskManager.addLeaveTask(bot.jda, guildId)
     }
 
     /**
@@ -190,7 +190,7 @@ class AudioHandler(private val bot: AlphaMusic, private val player: AudioPlayer,
     }
 
     override fun onPlayerPause(player: AudioPlayer?) {
-        bot.taskManager.addLeaveTask(bot.jda.guilds.first { it.id == guildId })
+        bot.taskManager.addLeaveTask(bot.jda, guildId)
     }
 
     override fun onPlayerResume(player: AudioPlayer?) {

diff --git a/src/main/kotlin/com/blitzoffline/alphamusic/commands/StopCommand.kt b/src/main/kotlin/com/blitzoffline/alphamusic/commands/StopCommand.kt
@@ -36,7 +36,7 @@ class StopCommand(private val bot: AlphaMusic) : BaseCommand() {
             voteManager?.votes?.clear()
             musicManager.audioHandler.clear()
             musicManager.player.stopTrack()
-            bot.taskManager.addLeaveTask(guild)
+            bot.taskManager.addLeaveTask(bot.jda, guild.id)
             return event.terminate("Stopped the audio!")
         }
 
@@ -46,7 +46,7 @@ class StopCommand(private val bot: AlphaMusic) : BaseCommand() {
             voteManager?.votes?.clear()
             musicManager.audioHandler.clear()
             musicManager.player.stopTrack()
-            bot.taskManager.addLeaveTask(guild)
+            bot.taskManager.addLeaveTask(bot.jda, guild.id)
             return event.terminate("Stopped the audio!")
         }
 
@@ -64,7 +64,7 @@ class StopCommand(private val bot: AlphaMusic) : BaseCommand() {
             voteManager.votes.clear()
             musicManager.audioHandler.clear()
             musicManager.player.stopTrack()
-            bot.taskManager.addLeaveTask(guild)
+            bot.taskManager.addLeaveTask(bot.jda, guild.id)
             return event.terminate("Stopped the audio!")
         }
 

diff --git a/src/main/kotlin/com/blitzoffline/alphamusic/listeners/VoiceChannelListener.kt b/src/main/kotlin/com/blitzoffline/alphamusic/listeners/VoiceChannelListener.kt
@@ -46,7 +46,7 @@ class VoiceChannelListener(private val bot: AlphaMusic) : ListenerAdapter() {
         val musicManager = bot.getMusicManager(guild)
 
         musicManager.player.isPaused = true
-        return bot.taskManager.addLeaveTask(guild)
+        return bot.taskManager.addLeaveTask(bot.jda, guild.id)
     }
 
     private fun onBotUnsuppressOrUnmute(guild: Guild, voiceState: GuildVoiceState) {
@@ -75,22 +75,22 @@ class VoiceChannelListener(private val bot: AlphaMusic) : ListenerAdapter() {
             if (channelLeft.members.size >= 2) return
             if (channelLeft.members[0] != guild.selfMember) return
 
-            bot.taskManager.addLeaveTask(guild)
+            bot.taskManager.addLeaveTask(bot.jda, guild.id)
         }
     }
 
     private fun onGuildVoiceJoin(guild: Guild, member: Member, channelJoined: AudioChannel) {
         if (member.id == guild.selfMember.id) {
             val afk = guild.afkChannel
             if (afk != null && channelJoined.id == afk.id) {
-                return bot.taskManager.addLeaveTask(guild)
+                return bot.taskManager.addLeaveTask(bot.jda, guild.id)
             }
 
             val musicManager = bot.getMusicManager(guild)
             musicManager.player.isPaused = false
 
             if (musicManager.player.playingTrack == null) {
-                bot.taskManager.addLeaveTask(guild)
+                bot.taskManager.addLeaveTask(bot.jda, guild.id)
             }
             bot.taskManager.removeClearTask(guild.id)
         } else {

diff --git a/src/main/kotlin/com/blitzoffline/alphamusic/tasks/TaskManager.kt b/src/main/kotlin/com/blitzoffline/alphamusic/tasks/TaskManager.kt
@@ -4,7 +4,7 @@ import com.blitzoffline.alphamusic.audio.GuildMusicManager
 import java.util.Timer
 import java.util.TimerTask
 import kotlin.concurrent.schedule
-import net.dv8tion.jda.api.entities.Guild
+import net.dv8tion.jda.api.JDA
 
 class TaskManager {
     private val clearTasks = hashMapOf<String, TimerTask>()
@@ -14,14 +14,15 @@ class TaskManager {
         return leaveTasks
     }
 
-    @Synchronized fun addLeaveTask(guild: Guild, delay: Long = 300000) {
-        if (leaveTasks[guild.id] != null) {
+    @Synchronized fun addLeaveTask(jda: JDA, guildId: String, delay: Long = 300000) {
+        if (leaveTasks[guildId] != null) {
             return
         }
 
-        leaveTasks[guild.id] = Timer().schedule(delay) {
+        leaveTasks[guildId] = Timer().schedule(delay) {
+            val guild = jda.guildCache.firstOrNull { it.id == guildId } ?: return@schedule
             guild.audioManager.closeAudioConnection()
-            removeLeaveTask(guild.id)
+            removeLeaveTask(guildId)
         }
     }