Bugfixes

- Fix bug causing tonbrett sounds not to load
- Fix bug in lavalink plugin route
- Fix exception when calling lavalink api due to missing content type

bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/core/LavalinkPlugin.kt

@@ -20,10 +20,12 @@ import io.ktor.client.request.header
 import io.ktor.client.request.request
 import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
+import io.ktor.http.ContentType.Application
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
 import io.ktor.http.URLProtocol
 import io.ktor.http.appendPathSegments
+import io.ktor.http.contentType
 import io.ktor.http.isSecure
 import io.ktor.http.takeFrom
 import io.ktor.resources.Resource
@@ -47,6 +49,7 @@ object Tonbrett : Plugin {
 suspend fun Node.syncSounds() = request(HttpMethod.Post, "v4", "sounds", "sync")
 suspend fun Node.deleteSound(id: String) = request(HttpMethod.Delete, "v4", "sounds", id)
 suspend fun Node.syncSound(sound: Sound) = request(HttpMethod.Put, "v4", "sounds") {
+    contentType(Application.Json)
     setBody(sound)
 }
 

bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/SoundsRoute.kt

@@ -4,7 +4,6 @@ import dev.kord.cache.api.query
 import dev.kord.common.annotation.KordExperimental
 import dev.kord.common.annotation.KordUnsafe
 import dev.kord.core.Kord
-import dev.kord.core.behavior.edit
 import dev.kord.core.cache.data.SoundboardSoundData
 import dev.kord.core.cache.idEq
 import dev.kordex.core.koin.KordExContext
@@ -13,7 +12,6 @@ import dev.schlaubi.tonbrett.bot.core.soundPlayer
 import dev.schlaubi.tonbrett.bot.core.voiceState
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.io.findAllTags
-import dev.schlaubi.tonbrett.bot.io.findById
 import dev.schlaubi.tonbrett.bot.io.searchGrouped
 import dev.schlaubi.tonbrett.bot.util.badRequest
 import dev.schlaubi.tonbrett.bot.util.soundNotFound
@@ -30,6 +28,8 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.Route
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.toList
+import org.bson.types.ObjectId
+import org.litote.kmongo.toId
 import kotlin.time.Duration.Companion.milliseconds
 
 private val discordIdPattern = Regex("\\d{18,}")
@@ -45,7 +45,7 @@ fun Route.sounds() {
             }.singleOrNull() ?: return null
             cachedSound.toSound()
         } else {
-            SoundBoardDatabase.sounds.findOneById(id)
+            SoundBoardDatabase.sounds.findOneById(ObjectId(id))
         }
     }
 
@@ -91,7 +91,11 @@ fun Route.sounds() {
             }
 
         call.respond(
-            (SoundBoardDatabase.sounds.searchGrouped(queryString, onlyMine, if(isLavalink) Snowflake.min else call.userId)
+            (SoundBoardDatabase.sounds.searchGrouped(
+                queryString,
+                onlyMine,
+                if (isLavalink) Snowflake.min else call.userId
+            )
                 .toList() + discordSound)
                 .convertForNonJvmPlatforms(!useUnicode)
         )

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "2.1.3"
+    version = "2.1.4"
 
     repositories {
         mavenCentral()

lavalink-plugin/src/main/kotlin/RestHandler.kt

@@ -22,8 +22,7 @@ class RestHandler(private val soundDownloader: SoundDownloader) : CoroutineScope
 
     override val coroutineContext: CoroutineContext = Dispatchers.IO + SupervisorJob()
 
-
-    @PutMapping(value = ["/v4/sounds/"])
+    @PutMapping(value = ["/v4/sounds"])
     fun downloadSound(@RequestBody sound: Sound) = runBlocking {
         soundDownloader.downloadSound(sound)