Remove youtube cache

Author: duncte123

build.gradle.kts

@@ -58,7 +58,6 @@ repositories {
     maven("https://m2.duncte123.dev/releases")
     maven("https://m2.duncte123.dev/snapshots")
     maven("https://m2.dv8tion.net/releases")
-    maven("https://maven.notfab.net/Hosted")
     maven("https://jitpack.io")
 }
 
@@ -95,9 +94,6 @@ dependencies {
     //Spotify API
     implementation(group = "se.michaelthelin.spotify", name = "spotify-web-api-java", version = "7.2.0")
 
-    // Youtube Cache
-    implementation(group = "net.notfab.cache", name = "cache-client", version = "2.2.1")
-
     // Youtube api
     implementation(group = "com.google.apis", name = "google-api-services-youtube", version = "v3-rev222-1.25.0")
 

src/main/java/ml/duncte123/skybot/Variables.java

@@ -42,7 +42,6 @@
 import net.jodah.expiringmap.EntryLoader;
 import net.jodah.expiringmap.ExpirationPolicy;
 import net.jodah.expiringmap.ExpiringMap;
-import net.notfab.caching.client.CacheClient;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
@@ -67,7 +66,6 @@ public final class Variables {
     private final Alexflipnote alexflipnote;
     private final WeebApi weebApi;
     private final DunctebotConfig config;
-    private final CacheClient youtubeCache;
     private AbstractDatabase database;
     @SuppressWarnings("PMD.UseConcurrentHashMap")
     private final DBMap<Long, GuildSetting> guildSettingsCache = new DBMap<>(ExpiringMap.builder()
@@ -90,16 +88,6 @@ public final class Variables {
         this.apis = new DuncteApis("Bot " + this.config.discord.token, this.mapper);
         this.commandManager = new CommandManager(this);
         this.blargBot = new BlargBot(this.config.apis.blargbot, this.mapper);
-
-        // Audio Utils needs the client
-        final var ytcfg = this.config.apis.youtubeCache;
-        this.youtubeCache = new CacheClient(ytcfg.endpoint, ytcfg.token, Executors.newCachedThreadPool((r) -> {
-            final Thread thread = new Thread(r, "Cache-Thread");
-            thread.setDaemon(true);
-
-            return thread;
-        }));
-
         this.audioUtils = new AudioUtils(this.config.apis, this);
         this.alexflipnote = new Alexflipnote(this.mapper, this.config.apis.alexflipnote);
         this.weebApi = new WeebApiBuilder(TokenType.WOLKETOKENS)
@@ -151,10 +139,6 @@ public String getGoogleBaseUrl() {
         return this.googleBaseUrl;
     }
 
-    public CacheClient getYoutubeCache() {
-        return this.youtubeCache;
-    }
-
     public WeebApi getWeebApi() {
         return this.weebApi;
     }

src/main/java/ml/duncte123/skybot/audio/AudioLoader.java

@@ -25,7 +25,6 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import ml.duncte123.skybot.CommandManager;
-import ml.duncte123.skybot.audio.sourcemanagers.youtube.YoutubeAudioSourceManagerOverride;
 import ml.duncte123.skybot.commands.music.RadioCommand;
 import ml.duncte123.skybot.exceptions.LimitReachedException;
 import ml.duncte123.skybot.extensions.AudioTrackKt;
@@ -64,8 +63,6 @@ public AudioLoader(CommandContext ctx, GuildMusicManager mng, boolean announce,
 
     @Override
     public void trackLoaded(AudioTrack track) {
-        addToIndex(track);
-
         track.setUserData(new TrackUserData(this.requester));
 
         final TrackScheduler scheduler = this.mng.getScheduler();
@@ -125,7 +122,6 @@ public void playlistLoaded(AudioPlaylist playlist) {
             }
 
             final List<AudioTrack> tracks = tracksRaw.stream().peek((track) -> {
-                addToIndex(track);
                 // don't store this externally since it will cause issues
                 track.setUserData(new TrackUserData(this.requester));
             }).toList();
@@ -196,12 +192,6 @@ public void loadFailed(FriendlyException exception) {
 
     }
 
-    private void addToIndex(AudioTrack track) {
-        if (!(track instanceof YoutubeAudioSourceManagerOverride.DoNotCache)) {
-            this.ctx.getYoutubeCache().addToIndex(track);
-        }
-    }
-
     private static String getSteamTitle(AudioTrack track, String rawTitle, CommandManager commandManager) {
         String title = rawTitle;
 

src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiSearchProvider.java

@@ -25,12 +25,6 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import ml.duncte123.skybot.audio.sourcemanagers.youtube.YoutubeAudioSourceManagerOverride.DoNotCache;
-import net.notfab.caching.client.CacheClient;
-import net.notfab.caching.shared.CacheResponse;
-import net.notfab.caching.shared.Track;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.function.Function;
@@ -39,11 +33,9 @@
 
 public class YoutubeApiSearchProvider implements YoutubeSearchResultLoader {
     private final String apiKey;
-    private final CacheClient cacheClient;
 
-    public YoutubeApiSearchProvider(String apiKey, CacheClient cacheClient) {
+    public YoutubeApiSearchProvider(String apiKey) {
         this.apiKey = apiKey;
-        this.cacheClient = cacheClient;
     }
 
     @Override
@@ -65,23 +57,8 @@ private AudioItem searchYoutubeAPI(String query, Function<AudioTrackInfo, AudioT
             }
 
             final String videoId = searchResults.get(0).getId().getVideoId();
-            final Track fromCache = this.getTrackFromCache(videoId);
-
-            if (fromCache != null) {
-                final AudioTrackInfo info = AudioTrackInfoBuilder.empty()
-                    .setTitle(fromCache.getTitle())
-                    .setAuthor(fromCache.getAuthor())
-                    .setLength(fromCache.getLength())
-                    .setIdentifier(fromCache.getId())
-                    .setIsStream(fromCache.isStream())
-                    .setUri(fromCache.toURL())
-                    .build();
-
-                return new DoNotCache(trackFactory.apply(info));
-            }
-
             final AudioTrackInfo info = videoToTrackInfo(
-                getVideoById(searchResults.get(0).getId().getVideoId(), this.apiKey)
+                getVideoById(videoId, this.apiKey)
             );
 
             return trackFactory.apply(info);
@@ -90,14 +67,4 @@ private AudioItem searchYoutubeAPI(String query, Function<AudioTrackInfo, AudioT
             throw ExceptionTools.wrapUnfriendlyExceptions(e);
         }
     }
-
-    private Track getTrackFromCache(String videoId) {
-        final CacheResponse found = this.cacheClient.get(videoId);
-
-        if (found.isFailure()) {
-            return null;
-        }
-
-        return found.getTrack();
-    }
 }

src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java

@@ -22,44 +22,32 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.notfab.caching.client.CacheClient;
-import net.notfab.caching.shared.CacheResponse;
 
 import java.io.IOException;
 
 import static ml.duncte123.skybot.utils.YoutubeUtils.getVideoById;
 import static ml.duncte123.skybot.utils.YoutubeUtils.videoToTrack;
 
 public class YoutubeAudioSourceManagerOverride extends YoutubeAudioSourceManager {
-
-    private final CacheClient cacheClient;
     private final String ytApiKey;
 
-    public YoutubeAudioSourceManagerOverride(CacheClient cacheClient, String ytApiKey) {
+    public YoutubeAudioSourceManagerOverride(String ytApiKey) {
         super(
             true,
             new DefaultYoutubeTrackDetailsLoader(),
-            new YoutubeApiSearchProvider(ytApiKey, cacheClient),
+            new YoutubeApiSearchProvider(ytApiKey),
             new YoutubeSearchMusicProvider(),
             new YoutubeSignatureCipherManager(),
             new YoutubeApiPlaylistLoader(ytApiKey),
             new DefaultYoutubeLinkRouter(),
             new YoutubeMixProvider()
         );
 
-        this.cacheClient = cacheClient;
         this.ytApiKey = ytApiKey;
     }
 
     @Override
     public AudioItem loadTrackWithVideoId(String videoId, boolean mustExist) {
-        final CacheResponse cacheResponse = this.cacheClient.get(videoId);
-
-        if (!cacheResponse.failure && cacheResponse.getTrack() != null) {
-            final AudioTrack track = cacheResponse.getTrack().toAudioTrack(this);
-            return new DoNotCache(track);
-        }
-
         if (mustExist) {
             return getFromYoutubeApi(videoId);
         }

src/main/java/ml/duncte123/skybot/objects/command/CommandContext.java

@@ -35,7 +35,6 @@
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
-import net.notfab.caching.client.CacheClient;
 
 import java.util.Collections;
 import java.util.List;
@@ -69,10 +68,6 @@ public Variables getVariables() {
         return this.variables;
     }
 
-    public CacheClient getYoutubeCache() {
-        return this.variables.getYoutubeCache();
-    }
-
     public CommandManager getCommandManager() {
         return this.variables.getCommandManager();
     }

src/main/java/ml/duncte123/skybot/utils/AudioUtils.java

@@ -54,10 +54,7 @@ public AudioUtils(DunctebotConfig.Apis config, Variables variables) {
         playerManager = new DefaultAudioPlayerManager();
         //playerManager.enableGcMonitoring();
 
-        final YoutubeAudioSourceManagerOverride sourceManager = new YoutubeAudioSourceManagerOverride(
-            variables.getYoutubeCache(),
-            config.googl
-        );
+        final YoutubeAudioSourceManagerOverride sourceManager = new YoutubeAudioSourceManagerOverride(config.googl);
 
         playerManager.registerSourceManager(new SpotifyAudioSourceManager(sourceManager, config));
         playerManager.registerSourceManager(sourceManager);