Use OKHttp URL builder for auto encoding of segments

Author: duncte123

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

@@ -106,18 +106,15 @@ class HttpBuilder(private val internalBuilder: Request.Builder) : Request.Builde
         return this
     }
 
-    override fun url(url: URL): HttpBuilder {
-        this.path = url.toString().toHttpUrl().encodedPath
-        return this
-    }
+    override fun url(url: URL) = path(url.toString().toHttpUrl().encodedPath)
 
-    override fun url(url: String): HttpBuilder {
-        this.path = url.toHttpUrl().encodedPath
-        return this
-    }
+    override fun url(url: String) = path(url.toHttpUrl().encodedPath)
 
-    override fun url(url: HttpUrl): HttpBuilder {
-        this.path = url.encodedPath
-        return this
+    override fun url(url: HttpUrl) = path(url.encodedPath)
+
+    fun url(configure: HttpUrl.Builder.() -> HttpUrl.Builder): HttpBuilder {
+        return url(
+            configure(HttpUrl.Builder()).build()
+        )
     }
 }

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

@@ -12,8 +12,6 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import reactor.core.publisher.Mono
 import java.io.IOException
-import java.net.URLEncoder
-import java.nio.charset.StandardCharsets
 
 class LavalinkRestClient(val node: LavalinkNode) {
     fun getPlayers(): Mono<Players> {
@@ -43,18 +41,20 @@ class LavalinkRestClient(val node: LavalinkNode) {
     }
 
     fun loadItem(identifier: String): Mono<LoadResult> {
-        val encId = URLEncoder.encode(identifier, StandardCharsets.UTF_8)
-
         return newRequest {
-            path("/v4/loadtracks?identifier=$encId")
+            url {
+                addPathSegments("/v4/loadtracks")
+                addQueryParameter("identifier", identifier)
+            }
         }.toMono()
     }
 
     fun decodeTrack(encoded: String): Mono<Track> {
-        val enc = URLEncoder.encode(encoded, StandardCharsets.UTF_8)
-        
         return newRequest {
-            path("/v4/decodetrack?encodedTrack=$enc")
+            url {
+                addPathSegments("/v4/decodetrack")
+                addQueryParameter("encodedTrack", encoded)
+            }
         }.toMono()
     }