Fix http builder

Author: duncte123

settings.gradle.kts

@@ -44,6 +44,7 @@ fun VersionCatalogBuilder.discordLibs() {
 }
 
 fun VersionCatalogBuilder.testLibs() {
+    library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.16.0")
     library("logger-impl", "ch.qos.logback", "logback-classic").version("1.4.14")
     library("lyrics", "com.github.DuncteBot.java-timed-lyrics", "protocol").version("1.2.0")
     library("lavasearch", "com.github.topi314.lavasearch", "lavasearch-protocol").version("1.0.0-beta.2")

src/main/kotlin/dev/arbjerg/lavalink/client/http/HttpBuilder.kt

@@ -106,15 +106,25 @@ class HttpBuilder(private val internalBuilder: Request.Builder) : Request.Builde
         return this
     }
 
-    override fun url(url: URL) = path(url.toString().toHttpUrl().encodedPath)
+    override fun url(url: URL) = path(url.toString().toHttpUrl().getQueryPath())
 
-    override fun url(url: String) = path(url.toHttpUrl().encodedPath)
+    override fun url(url: String) = path(url.toHttpUrl().getQueryPath())
 
-    override fun url(url: HttpUrl) = path(url.encodedPath)
+    override fun url(url: HttpUrl) = path(url.getQueryPath())
 
     fun url(configure: HttpUrl.Builder.() -> HttpUrl.Builder): HttpBuilder {
         return url(
-            configure(HttpUrl.Builder()).build()
+            configure(HttpUrl.Builder()).scheme("https").host("localghost").build()
         )
     }
+
+    private fun HttpUrl.getQueryPath(): String {
+        var result = this.encodedPath
+
+        this.encodedQuery?.let { query ->
+            result += "?$query"
+        }
+
+        return result
+    }
 }

src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkRestClient.kt

@@ -43,7 +43,7 @@ class LavalinkRestClient(val node: LavalinkNode) {
     fun loadItem(identifier: String): Mono<LoadResult> {
         return newRequest {
             url {
-                addPathSegments("/v4/loadtracks")
+                addPathSegments("v4/loadtracks")
                 addQueryParameter("identifier", identifier)
             }
         }.toMono()
@@ -52,7 +52,7 @@ class LavalinkRestClient(val node: LavalinkNode) {
     fun decodeTrack(encoded: String): Mono<Track> {
         return newRequest {
             url {
-                addPathSegments("/v4/decodetrack")
+                addPathSegments("v4/decodetrack")
                 addQueryParameter("encodedTrack", encoded)
             }
         }.toMono()

testbot/build.gradle.kts

@@ -21,6 +21,7 @@ dependencies {
 
     // other libs such as a discord client and a logger
     implementation(libs.jda)
+    implementation(libs.jackson.databind)
     implementation(libs.logger.impl)
     implementation(libs.lyrics)
 }

testbot/src/main/java/me/duncte123/testbot/JDAListener.java

@@ -1,5 +1,6 @@
 package me.duncte123.testbot;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.arbjerg.lavalink.client.LavalinkClient;
 import dev.arbjerg.lavalink.client.Link;
 import dev.arbjerg.lavalink.client.player.FilterBuilder;
@@ -32,6 +33,8 @@ public class JDAListener extends ListenerAdapter {
 
     private static final Logger LOG = LoggerFactory.getLogger(JDAListener.class);
 
+    private final ObjectMapper mapper = new ObjectMapper();
+
     public final Map<Long, GuildMusicManager> musicManagers = new HashMap<>();
     private final LavalinkClient client;
     private final EvalEngine evalEngine;
@@ -56,6 +59,13 @@ public void onReady(@NotNull ReadyEvent event) {
                         "Script to eval",
                         true
                     ),
+                Commands.slash("decode", "Try to decode some base 64 track")
+                    .addOption(
+                        OptionType.STRING,
+                        "encoded",
+                        "VALID encoded track to decode",
+                        true
+                    ),
                 Commands.slash("join", "Join the voice channel you are in."),
                 Commands.slash("leave", "Leaves the vc"),
                 Commands.slash("stop", "Stops the current track"),
@@ -126,6 +136,24 @@ public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent even
                 });
                 break;
             }
+            case "decode": {
+
+                final var link = this.client.getOrCreateLink(guild.getIdLong());
+
+                link.getNode().decodeTrack(event.getOption("encoded").getAsString()).subscribe(
+                    (result) -> {
+                        try {
+                            event.reply("```json\n" + mapper.writeValueAsString(result) + "```").queue();
+                        } catch (Exception e) {
+                            event.reply("Jackson bork: " + e.getMessage()).queue();
+                        }
+                    },
+                    (error) -> {
+                        event.reply("Fucky qucky: " + error.getMessage()).queue();
+                    }
+                );
+                break;
+            }
             case "join":
                 joinHelper(event);
                 break;