Skip to content

Commit 90f0b7d

Browse files
committed
Use server-provided config classes
1 parent 1846e47 commit 90f0b7d

File tree

4 files changed

+18
-80
lines changed

4 files changed

+18
-80
lines changed

plugin/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@ val moduleName = "plugin"
77

88
dependencies {
99
compileOnly("dev.arbjerg.lavalink:plugin-api:3.7.11")
10+
compileOnly("dev.arbjerg.lavalink:Lavalink-Server:3.7.11")
1011
compileOnly("dev.arbjerg:lavaplayer-ext-youtube-rotator:1.5.3")
1112
compileOnly(project(":common"))
1213
compileOnly(project(":lldevs"))
1314
}
1415

16+
java {
17+
sourceCompatibility = JavaVersion.VERSION_11
18+
targetCompatibility = JavaVersion.VERSION_11
19+
}
20+
1521
val sourcesJar by tasks.registering(Jar::class) {
1622
archiveClassifier.set("sources")
1723
from(sourceSets["main"].allSource)

plugin/src/main/java/dev/lavalink/youtube/plugin/RatelimitConfig.java

Lines changed: 0 additions & 57 deletions
This file was deleted.

plugin/src/main/java/dev/lavalink/youtube/plugin/ServerConfig.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

plugin/src/main/java/dev/lavalink/youtube/plugin/YoutubePluginLoader.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import dev.arbjerg.lavalink.api.AudioPlayerManagerConfiguration;
1010
import dev.lavalink.youtube.YoutubeAudioSourceManager;
1111
import dev.lavalink.youtube.clients.skeleton.Client;
12+
import lavalink.server.config.RateLimitConfig;
13+
import lavalink.server.config.ServerConfig;
1214
import org.slf4j.Logger;
1315
import org.slf4j.LoggerFactory;
1416
import org.springframework.stereotype.Service;
@@ -28,18 +30,18 @@ public class YoutubePluginLoader implements AudioPlayerManagerConfiguration {
2830
private static final Logger log = LoggerFactory.getLogger(YoutubePluginLoader.class);
2931

3032
private final YoutubeConfig youtubeConfig;
31-
private final RatelimitConfig ratelimitConfig;
3233
private final ServerConfig serverConfig;
34+
private final RateLimitConfig ratelimitConfig;
3335
private final ClientProvider clientProvider;
3436

3537
// This entire thing is a hack BTW. Designed to support Lavalink v3 and v4
3638
// with a single plugin. Totally worth it!
3739
public YoutubePluginLoader(final YoutubeConfig youtubeConfig,
38-
final RatelimitConfig ratelimitConfig,
39-
final ServerConfig serverConfig) {
40+
final ServerConfig serverConfig,
41+
final RateLimitConfig ratelimitConfig) {
4042
this.youtubeConfig = youtubeConfig;
41-
this.ratelimitConfig = ratelimitConfig;
4243
this.serverConfig = serverConfig;
44+
this.ratelimitConfig = ratelimitConfig;
4345

4446
final String providerName = isV4OrNewer()
4547
? "ClientProviderV4"
@@ -155,7 +157,12 @@ public AudioPlayerManager configure(AudioPlayerManager audioPlayerManager) {
155157
rotator.setup();
156158
}
157159

158-
source.setPlaylistPageCount(serverConfig.getYoutubePlaylistLoadLimit());
160+
Integer playlistLoadLimit = serverConfig.getYoutubePlaylistLoadLimit();
161+
162+
if (playlistLoadLimit != null) {
163+
source.setPlaylistPageCount(playlistLoadLimit);
164+
}
165+
159166
audioPlayerManager.registerSourceManager(source);
160167
return audioPlayerManager;
161168
}

0 commit comments

Comments
 (0)