Merge pull request #933 from lavalink-devs/dev

lavalink-devs · Aug 3, 2023 · 01b819a · 01b819a
2 parents e2281a4 + 9d85bed
commit 01b819a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,6 +18,14 @@ on:
         required: false
       MAVEN_PASSWORD:
         required: false
+      ORG_GRADLE_PROJECT_mavenCentralPassword:
+        required: false
+      ORG_GRADLE_PROJECT_mavenCentralUsername:
+        required: false
+      ORG_GRADLE_PROJECT_signingInMemoryKey:
+        required: false
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword:
+        required: false
 
 jobs:
   build:
@@ -29,6 +37,10 @@ jobs:
       DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
       MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
       MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
+      ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
+      ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,10 @@ jobs:
       DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
       MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
       MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
+      ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
+      ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
 
   release:
     needs: build

diff --git a/LavalinkServer/src/main/java/lavalink/server/player/AudioLoader.kt b/LavalinkServer/src/main/java/lavalink/server/player/AudioLoader.kt
@@ -49,12 +49,12 @@ class AudioLoader(
     private val loadResult = CompletableFuture<LoadResult>()
     private val used = AtomicBoolean(false)
 
-    fun load(identifier: String?): CompletionStage<LoadResult> {
+    fun load(identifier: String?): LoadResult {
         val isUsed = used.getAndSet(true)
         check(!isUsed) { "This loader can only be used once per instance" }
         log.trace("Loading item with identifier $identifier")
-        audioPlayerManager.loadItem(identifier, this)
-        return loadResult
+        audioPlayerManager.loadItemSync(identifier, this)
+        return loadResult.get()
     }
 
     override fun trackLoaded(audioTrack: AudioTrack) {

diff --git a/LavalinkServer/src/main/java/lavalink/server/player/AudioLoaderRestHandler.kt b/LavalinkServer/src/main/java/lavalink/server/player/AudioLoaderRestHandler.kt
@@ -51,10 +51,9 @@ class AudioLoaderRestHandler(
     fun loadTracks(
         request: HttpServletRequest,
         @RequestParam identifier: String
-    ): CompletionStage<ResponseEntity<LoadResult>> {
+    ): ResponseEntity<LoadResult> {
         log.info("Got request to load for identifier \"${identifier}\"")
-        return AudioLoader(audioPlayerManager, pluginInfoModifiers).load(identifier)
-            .thenApply { ResponseEntity.ok(it) }
+        return ResponseEntity.ok(AudioLoader(audioPlayerManager, pluginInfoModifiers).load(identifier))
     }
 
     @GetMapping("/v4/decodetrack")

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -36,10 +36,10 @@ fun VersionCatalogBuilder.spring() {
 }
 
 fun VersionCatalogBuilder.voice() {
-    version("lavaplayer", "08cfbc0595")
+    version("lavaplayer", "2.0.0")
 
-    library("lavaplayer",            "com.github.walkyst.lavaplayer-fork", "lavaplayer").versionRef("lavaplayer")
-    library("lavaplayer-ip-rotator", "com.github.walkyst.lavaplayer-fork", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer")
+    library("lavaplayer",            "dev.arbjerg", "lavaplayer").versionRef("lavaplayer")
+    library("lavaplayer-ip-rotator", "dev.arbjerg", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer")
     library("lavadsp",               "dev.arbjerg", "lavadsp").version("0.7.8")
 
     library("koe",          "moe.kyokobot.koe", "core").version("2.0.0-rc1")