Remove deprecated methods from AudioUtils

duncte123 · duncte123 · commit ee5fcb372edd · 2023-08-25T12:23:34.000+02:00
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/music/SeekCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/music/SeekCommand.java
@@ -66,7 +66,7 @@ public void run(@NotNull CommandContext ctx) {
     }
 
     public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
-        final LavalinkPlayer player = ctx.getAudioUtils().getMusicManager(ctx.getGuild()).player;
+        final LavalinkPlayer player = ctx.getAudioUtils().getMusicManager(ctx.getGuildId()).player;
         final AudioTrack currentTrack = player.getPlayingTrack();
 
         if (currentTrack == null) {
diff --git a/bot/src/main/java/ml/duncte123/skybot/objects/command/MusicCommand.java b/bot/src/main/java/ml/duncte123/skybot/objects/command/MusicCommand.java
@@ -105,7 +105,7 @@ private boolean channelChecks(CommandContext ctx, AudioUtils audioUtils, String
             return false;
         }
 
-        audioUtils.getMusicManager(guild).setLatestChannelId(ctx.getChannel().getIdLong());
+        audioUtils.getMusicManager(guild.getIdLong()).setLatestChannelId(ctx.getChannel().getIdLong());
 
         return true;
     }
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
@@ -39,7 +39,6 @@
 import ml.duncte123.skybot.audio.sourcemanagers.DBAudioRef;
 import ml.duncte123.skybot.audio.sourcemanagers.spotify.SpotifyAudioSourceManager;
 import ml.duncte123.skybot.objects.AudioData;
-import ml.duncte123.skybot.objects.command.CommandContext;
 import ml.duncte123.skybot.objects.config.DunctebotConfig;
 import net.dv8tion.jda.api.entities.Guild;
 import org.jetbrains.annotations.Nullable;
@@ -92,12 +91,6 @@ public BasicAudioPlaylist searchYoutube(String query) {
         return null;
     }
 
-    @Deprecated
-    public Future<Void> loadAndPlay(final CommandContext ctx, final String trackUrlRaw,
-                                    final boolean announce) {
-        return loadAndPlay(ctx.getAudioData(), trackUrlRaw, announce);
-    }
-
     public Future<Void> loadAndPlay(final AudioData data, final String trackUrlRaw,
                                     final boolean announce) {
         final boolean isPatron = CommandUtils.isUserTagPatron(data.getUserId());
@@ -118,12 +111,6 @@ public Future<Void> loadAndPlay(final AudioData data, final String trackUrlRaw,
         return getPlayerManager().loadItemOrdered(mng, reference, loader);
     }
 
-    // transition period
-    @Deprecated
-    public GuildMusicManager getMusicManager(Guild guild) {
-        return getMusicManager(guild.getIdLong());
-    }
-
     public GuildMusicManager getMusicManager(long guildId) {
         synchronized(this) {
             GuildMusicManager mng = musicManagers.get(guildId);
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/ReactionHandler.kt b/bot/src/main/kotlin/ml/duncte123/skybot/ReactionHandler.kt
@@ -86,7 +86,7 @@ class ReactionHandler : EventListener {
                 return
             }
 
-            ctx.audioUtils.loadAndPlay(ctx, "https://www.youtube.com/watch?v=$selectedId", true)
+            ctx.audioUtils.loadAndPlay(ctx.audioData, "https://www.youtube.com/watch?v=$selectedId", true)
             channel.deleteMessageById(cacheElement.msgID)
                 .queue(null, ignore(UNKNOWN_MESSAGE)) // Ignore the error if the message has already been deleted
         }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RadioCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RadioCommand.kt
@@ -62,14 +62,14 @@ class RadioCommand : MusicCommand() {
                 }
 
                 val audioUtils = ctx.audioUtils
-                val mng = audioUtils.getMusicManager(ctx.jdaGuild)
+                val mng = audioUtils.getMusicManager(ctx.guildId)
                 val player = mng.player
 
                 player.stopTrack()
                 player.isPaused = false
                 mng.scheduler.queue.clear()
 
-                audioUtils.loadAndPlay(ctx, radio.url, true)
+                audioUtils.loadAndPlay(ctx.audioData, radio.url, true)
             }
         }
     }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
@@ -36,12 +36,11 @@ class ReaddCommand : MusicCommand() {
     }
 
     override fun run(ctx: CommandContext) {
-        val event = ctx.event
-        val manager = ctx.audioUtils.getMusicManager(event.guild)
+        val manager = ctx.audioUtils.getMusicManager(ctx.guildId)
         val track = manager.player.playingTrack
 
         if (track == null) {
-            sendError(event.message)
+            sendError(ctx.message)
             sendMsg(ctx, "No tracks in queue")
             return
         }
@@ -65,7 +64,7 @@ class ReaddCommand : MusicCommand() {
 
         try {
             manager.scheduler.addToQueue(clone, isUserTagPatron(ctx.author))
-            sendSuccess(event.message)
+            sendSuccess(ctx.message)
             sendEmbed(ctx, EmbedUtils.embedMessage(msg))
         } catch (e: LimitReachedException) {
             sendMsg(ctx, "You exceeded the maximum queue size of ${e.size} tracks")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatCommand.kt
@@ -35,7 +35,7 @@ class RepeatCommand : MusicCommand() {
     }
 
     override fun run(ctx: CommandContext) {
-        val mng = ctx.audioUtils.getMusicManager(ctx.guild)
+        val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
         val scheduler = mng.scheduler
 
         if (ctx.args.size == 1) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatQueueCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatQueueCommand.kt
@@ -33,7 +33,7 @@ class RepeatQueueCommand : MusicCommand() {
     }
 
     override fun run(ctx: CommandContext) {
-        val mng = ctx.audioUtils.getMusicManager(ctx.guild)
+        val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
         val scheduler = mng.scheduler
 
         if (scheduler.isLooping) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt
@@ -32,11 +32,10 @@ class RestartCommand : MusicCommand() {
     }
 
     override fun run(ctx: CommandContext) {
-        val event = ctx.event
-        val player = ctx.audioUtils.getMusicManager(event.guild).player
+        val player = ctx.audioUtils.getMusicManager(ctx.guildId).player
 
         if (player.playingTrack == null) {
-            sendError(event.message)
+            sendError(ctx.message)
             sendMsg(ctx, "No track currently playing")
             return
         }
@@ -48,7 +47,7 @@ class RestartCommand : MusicCommand() {
 
         player.seekTo(0)
 
-        sendSuccess(event.message)
+        sendSuccess(ctx.message)
     }
 
     override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.Variables
 import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.objects.command.MusicCommand
 import ml.duncte123.skybot.utils.AudioUtils
-import net.dv8tion.jda.api.entities.Guild
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 import net.dv8tion.jda.api.utils.FileUpload
 import java.time.ZonedDateTime
@@ -42,7 +41,7 @@ class SaveCommand : MusicCommand() {
         ctx.channel.sendMessage("${ctx.author.asTag}, here is the queue which can be re-imported with `${ctx.prefix}load`")
             .addFiles(
                 FileUpload.fromData(
-                    toByteArray(ctx.guild, ctx.audioUtils, ctx.variables.jackson),
+                    toByteArray(ctx.guildId, ctx.audioUtils, ctx.variables.jackson),
                     "playlist-${getDatabaseDateFormat(ZonedDateTime.now())}.json"
                 )
             )
@@ -53,9 +52,9 @@ class SaveCommand : MusicCommand() {
         event.reply("Slash command not supported yet, sorry. Please report this issue.").queue()
     }
 
-    private fun toByteArray(guild: Guild, audioUtils: AudioUtils, mapper: ObjectMapper): ByteArray {
+    private fun toByteArray(guildId: Long, audioUtils: AudioUtils, mapper: ObjectMapper): ByteArray {
         val array = mapper.createArrayNode()
-        val manager = audioUtils.getMusicManager(guild)
+        val manager = audioUtils.getMusicManager(guildId)
 
         val urls = manager.scheduler.queue
             .map {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ShuffleCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ShuffleCommand.kt
@@ -32,8 +32,7 @@ class ShuffleCommand : MusicCommand() {
     }
 
     override fun run(ctx: CommandContext) {
-        val event = ctx.event
-        val scheduler = ctx.audioUtils.getMusicManager(event.guild).scheduler
+        val scheduler = ctx.audioUtils.getMusicManager(ctx.guildId).scheduler
 
         if (scheduler.queue.isEmpty()) {
             MessageUtils.sendMsg(ctx, "There are no songs to shuffle")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt
@@ -43,7 +43,7 @@ class VolumeCommand : MusicCommand() {
             return
         }
 
-        val mng = ctx.audioUtils.getMusicManager(ctx.guild)
+        val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
         val player = mng.player
         val args = ctx.args
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void run(@NotNull CommandContext ctx) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {`
`69`		`- final LavalinkPlayer player = ctx.getAudioUtils().getMusicManager(ctx.getGuild()).player;`
	`69`	`+ final LavalinkPlayer player = ctx.getAudioUtils().getMusicManager(ctx.getGuildId()).player;`
`70`	`70`	`final AudioTrack currentTrack = player.getPlayingTrack();`
`71`	`71`
`72`	`72`	`if (currentTrack == null) {`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private boolean channelChecks(CommandContext ctx, AudioUtils audioUtils, String`
`105`	`105`	`return false;`
`106`	`106`	`}`
`107`	`107`
`108`		`- audioUtils.getMusicManager(guild).setLatestChannelId(ctx.getChannel().getIdLong());`
	`108`	`+ audioUtils.getMusicManager(guild.getIdLong()).setLatestChannelId(ctx.getChannel().getIdLong());`
`109`	`109`
`110`	`110`	`return true;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class ReactionHandler : EventListener {`
`86`	`86`	`return`
`87`	`87`	`}`
`88`	`88`
`89`		`- ctx.audioUtils.loadAndPlay(ctx, "https://www.youtube.com/watch?v=$selectedId", true)`
	`89`	`+ ctx.audioUtils.loadAndPlay(ctx.audioData, "https://www.youtube.com/watch?v=$selectedId", true)`
`90`	`90`	`channel.deleteMessageById(cacheElement.msgID)`
`91`	`91`	`.queue(null, ignore(UNKNOWN_MESSAGE)) // Ignore the error if the message has already been deleted`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,14 +62,14 @@ class RadioCommand : MusicCommand() {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`val audioUtils = ctx.audioUtils`
`65`		`- val mng = audioUtils.getMusicManager(ctx.jdaGuild)`
	`65`	`+ val mng = audioUtils.getMusicManager(ctx.guildId)`
`66`	`66`	`val player = mng.player`
`67`	`67`
`68`	`68`	`player.stopTrack()`
`69`	`69`	`player.isPaused = false`
`70`	`70`	`mng.scheduler.queue.clear()`
`71`	`71`
`72`		`- audioUtils.loadAndPlay(ctx, radio.url, true)`
	`72`	`+ audioUtils.loadAndPlay(ctx.audioData, radio.url, true)`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class RepeatCommand : MusicCommand() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`override fun run(ctx: CommandContext) {`
`38`		`- val mng = ctx.audioUtils.getMusicManager(ctx.guild)`
	`38`	`+ val mng = ctx.audioUtils.getMusicManager(ctx.guildId)`
`39`	`39`	`val scheduler = mng.scheduler`
`40`	`40`
`41`	`41`	`if (ctx.args.size == 1) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class RepeatQueueCommand : MusicCommand() {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`override fun run(ctx: CommandContext) {`
`36`		`- val mng = ctx.audioUtils.getMusicManager(ctx.guild)`
	`36`	`+ val mng = ctx.audioUtils.getMusicManager(ctx.guildId)`
`37`	`37`	`val scheduler = mng.scheduler`
`38`	`38`
`39`	`39`	`if (scheduler.isLooping) {`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,10 @@ class RestartCommand : MusicCommand() {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`override fun run(ctx: CommandContext) {`
`35`		`- val event = ctx.event`
`36`		`- val player = ctx.audioUtils.getMusicManager(event.guild).player`
	`35`	`+ val player = ctx.audioUtils.getMusicManager(ctx.guildId).player`
`37`	`36`
`38`	`37`	`if (player.playingTrack == null) {`
`39`		`- sendError(event.message)`
	`38`	`+ sendError(ctx.message)`
`40`	`39`	`sendMsg(ctx, "No track currently playing")`
`41`	`40`	`return`
`42`	`41`	`}`
`@@ -48,7 +47,7 @@ class RestartCommand : MusicCommand() {`
`48`	`47`
`49`	`48`	`player.seekTo(0)`
`50`	`49`
`51`		`- sendSuccess(event.message)`
	`50`	`+ sendSuccess(ctx.message)`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {`