Merge pull request #194 from duncte123/ytsearch-toggle

Add option to disable ytsearch and scsearch

Author: freyacodes

LavalinkServer/application.yml.example

@@ -18,6 +18,8 @@ lavalink:
       local: false
     bufferDurationMs: 400
     youtubePlaylistLoadLimit: 6 # Number of pages at 100 each
+    youtubeSearchEnabled: true
+    soundcloudSearchEnabled: true
     gc-warnings: true
 
 metrics:

LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.java

@@ -31,14 +31,14 @@ public Supplier<AudioPlayerManager> audioPlayerManagerSupplier(AudioSourcesConfi
             }
 
             if (sources.isYoutube()) {
-                YoutubeAudioSourceManager youtube = new YoutubeAudioSourceManager();
+                YoutubeAudioSourceManager youtube = new YoutubeAudioSourceManager(serverConfig.isYoutubeSearchEnabled());
                 Integer playlistLoadLimit = serverConfig.getYoutubePlaylistLoadLimit();
 
                 if (playlistLoadLimit != null) youtube.setPlaylistPageCount(playlistLoadLimit);
                 audioPlayerManager.registerSourceManager(youtube);
             }
             if (sources.isBandcamp()) audioPlayerManager.registerSourceManager(new BandcampAudioSourceManager());
-            if (sources.isSoundcloud()) audioPlayerManager.registerSourceManager(new SoundCloudAudioSourceManager());
+            if (sources.isSoundcloud()) audioPlayerManager.registerSourceManager(new SoundCloudAudioSourceManager(serverConfig.isSoundcloudSearchEnabled()));
             if (sources.isTwitch()) audioPlayerManager.registerSourceManager(new TwitchStreamAudioSourceManager());
             if (sources.isVimeo()) audioPlayerManager.registerSourceManager(new VimeoAudioSourceManager());
             if (sources.isMixer()) audioPlayerManager.registerSourceManager(new BeamAudioSourceManager());

LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.java

@@ -38,6 +38,8 @@ public class ServerConfig {
     @Nullable
     private Integer youtubePlaylistLoadLimit;
     private boolean gcWarnings = true;
+    private boolean youtubeSearchEnabled = true;
+    private boolean soundcloudSearchEnabled = true;
 
     public String getPassword() {
         return password;
@@ -84,4 +86,20 @@ public boolean isGcWarnings() {
     public void setGcWarnings(boolean gcWarnings) {
         this.gcWarnings = gcWarnings;
     }
+
+    public boolean isYoutubeSearchEnabled() {
+        return youtubeSearchEnabled;
+    }
+
+    public void setYoutubeSearchEnabled(boolean youtubeSearchEnabled) {
+        this.youtubeSearchEnabled = youtubeSearchEnabled;
+    }
+
+    public boolean isSoundcloudSearchEnabled() {
+        return soundcloudSearchEnabled;
+    }
+
+    public void setSoundcloudSearchEnabled(boolean soundcloudSearchEnabled) {
+        this.soundcloudSearchEnabled = soundcloudSearchEnabled;
+    }
 }