Fix weird issue with commands not being processed after exception

devoxin · Apr 9, 2024 · bab6322 · bab6322
1 parent fea6997
commit bab6322
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/main/kotlin/me/devoxin/jukebot/audio/LoadResultHandler.kt b/src/main/kotlin/me/devoxin/jukebot/audio/LoadResultHandler.kt
@@ -15,6 +15,7 @@ import me.devoxin.flight.api.context.Context
 import me.devoxin.jukebot.audio.sources.caching.CachingSourceManager
 import me.devoxin.jukebot.extensions.embed
 import me.devoxin.jukebot.extensions.toTimeString
+import me.devoxin.jukebot.extensions.truncate
 import me.devoxin.jukebot.utils.Helpers
 import me.devoxin.jukebot.utils.Limits
 import me.devoxin.jukebot.utils.Scopes
@@ -146,7 +147,7 @@ class LoadResultHandler(
         val selectMenu = StringSelectMenu.create(eventId)
 
         for ((index, track) in tracks.withIndex()) {
-            selectMenu.addOption(track.info.title, index.toString(), "${track.info.author} - ${track.duration.toTimeString()}")
+            selectMenu.addOption(track.info.title.truncate(95), index.toString(), "${track.info.author} - ${track.duration.toTimeString()}")
         }
 
         val prompt = ctx.respond {

diff --git a/src/main/kotlin/me/devoxin/jukebot/commands/Playback.kt b/src/main/kotlin/me/devoxin/jukebot/commands/Playback.kt
@@ -14,6 +14,7 @@ import me.devoxin.jukebot.annotations.Prerequisites.TriggerConnect
 import me.devoxin.jukebot.extensions.audioPlayer
 import me.devoxin.jukebot.extensions.embed
 import me.devoxin.jukebot.extensions.toTimeString
+import me.devoxin.jukebot.extensions.truncate
 import me.devoxin.jukebot.utils.Scopes
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent
 import net.dv8tion.jda.api.interactions.commands.Command.Choice
@@ -137,7 +138,7 @@ class Playback : Cog {
                 ?: return event.replyChoices().queue()
 
             event.replyChoices(
-                searchResults.tracks.map { Choice("${it.info.author} - ${it.info.title} (${it.duration.toTimeString()})", it.info.uri) }
+                searchResults.tracks.map { Choice("${it.info.author} - ${it.info.title}".truncate(85) + " (${it.duration.toTimeString()})", it.info.uri) }
             ).queue()
         } catch (t: Throwable) {
             event.replyChoices().queue()

diff --git a/src/main/kotlin/me/devoxin/jukebot/events/FlightEventAdapter.kt b/src/main/kotlin/me/devoxin/jukebot/events/FlightEventAdapter.kt
@@ -41,7 +41,7 @@ class FlightEventAdapter : DefaultCommandEventAdapter() {
         ctx.embed("Incorrect Command Usage", """
             $message
             
-            `${error.argument.slashFriendlyName}`': ${error.argument.description}
+            `${error.argument.slashFriendlyName}`: ${error.argument.description}
             
             Syntax: `$syntax`
             

diff --git a/src/main/kotlin/me/devoxin/jukebot/utils/Scopes.kt b/src/main/kotlin/me/devoxin/jukebot/utils/Scopes.kt
@@ -2,7 +2,9 @@ package me.devoxin.jukebot.utils
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.plus
 
 object Scopes {
-    val IO = CoroutineScope(Dispatchers.IO)
+    val IO = CoroutineScope(Dispatchers.IO) + SupervisorJob()
 }