diff --git a/pom.xml b/pom.xml index eafe7fb..d98b3c2 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ net.dv8tion JDA - 5.0.0-alpha.18 + 5.0.0-alpha.20 org.yaml diff --git a/src/main/java/net/tylermurphy/ken/command/Responder.java b/src/main/java/net/tylermurphy/ken/command/Responder.java index 30e24f1..d7bdc15 100644 --- a/src/main/java/net/tylermurphy/ken/command/Responder.java +++ b/src/main/java/net/tylermurphy/ken/command/Responder.java @@ -3,6 +3,7 @@ package net.tylermurphy.ken.command; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -322,7 +323,7 @@ public class Responder extends ListenerAdapter { if(value != null) setValue = Boolean.parseBoolean(value); if(!setValue){ try { - event.getGuild().kick(user, "Server is currently closed").queue(); + event.getGuild().kick(user).reason("Server is currently closed").queue(); user.openPrivateChannel().queue(privateChannel -> { EmbedBuilder builder = Ken.getInstance().getDefaultEmbed() .appendDescription("Kicked from "+event.getGuild().getName() + " because the server is currently closed"); diff --git a/src/main/java/net/tylermurphy/ken/command/moderation/Ban.java b/src/main/java/net/tylermurphy/ken/command/moderation/Ban.java index 22ca558..6ea9427 100644 --- a/src/main/java/net/tylermurphy/ken/command/moderation/Ban.java +++ b/src/main/java/net/tylermurphy/ken/command/moderation/Ban.java @@ -4,8 +4,7 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.PrivateChannel; -import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; @@ -22,6 +21,7 @@ import org.json.JSONObject; import java.awt.*; import java.util.Date; import java.util.List; +import java.util.concurrent.TimeUnit; public class Ban { @@ -48,7 +48,7 @@ public class Ban { } catch (Exception ignored){} try { - guild.ban(target,purge ? 1 : 0,reason).queue(); + guild.ban(target,purge ? 1 : 0, TimeUnit.DAYS).reason(reason).queue(); } catch (Exception e){ return Response.error("Failed to ban user"); } diff --git a/src/main/java/net/tylermurphy/ken/command/moderation/Kick.java b/src/main/java/net/tylermurphy/ken/command/moderation/Kick.java index 9822d23..e63f716 100644 --- a/src/main/java/net/tylermurphy/ken/command/moderation/Kick.java +++ b/src/main/java/net/tylermurphy/ken/command/moderation/Kick.java @@ -4,8 +4,7 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.PrivateChannel; -import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; @@ -46,7 +45,7 @@ public class Kick { } catch (Exception ignored){} try { - guild.kick(target).queue(); + guild.kick(target).reason(reason).queue(); } catch (Exception e){ return Response.error("Failed to kick user"); } diff --git a/src/main/java/net/tylermurphy/ken/command/moderation/Mute.java b/src/main/java/net/tylermurphy/ken/command/moderation/Mute.java index 3b36c5e..eb0fc26 100644 --- a/src/main/java/net/tylermurphy/ken/command/moderation/Mute.java +++ b/src/main/java/net/tylermurphy/ken/command/moderation/Mute.java @@ -4,9 +4,7 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.PrivateChannel; -import net.dv8tion.jda.api.entities.Role; -import net.dv8tion.jda.api.exceptions.ErrorResponseException; +import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.Response; @@ -20,7 +18,6 @@ import org.json.JSONArray; import org.json.JSONObject; import java.awt.*; -import java.sql.Time; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -57,7 +54,7 @@ public class Mute { String date = format.format(time); try { - guild.timeoutUntil(target, new Date(time).toInstant()).queue(); + guild.timeoutUntil(target, new Date(time).toInstant()).reason(reason).queue(); } catch (Exception e){ return Response.error("Failed to mute user"); } diff --git a/src/main/java/net/tylermurphy/ken/command/moderation/Purge.java b/src/main/java/net/tylermurphy/ken/command/moderation/Purge.java index ab7eeea..22a21f1 100644 --- a/src/main/java/net/tylermurphy/ken/command/moderation/Purge.java +++ b/src/main/java/net/tylermurphy/ken/command/moderation/Purge.java @@ -2,8 +2,8 @@ package net.tylermurphy.ken.command.moderation; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.GuildMessageChannel; import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.command.annotation.Command; import net.tylermurphy.ken.command.annotation.Option; diff --git a/src/main/java/net/tylermurphy/ken/command/moderation/TempBan.java b/src/main/java/net/tylermurphy/ken/command/moderation/TempBan.java index dcab6bb..40fda75 100644 --- a/src/main/java/net/tylermurphy/ken/command/moderation/TempBan.java +++ b/src/main/java/net/tylermurphy/ken/command/moderation/TempBan.java @@ -4,8 +4,7 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.PrivateChannel; -import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; @@ -23,6 +22,7 @@ import java.awt.*; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.concurrent.TimeUnit; public class TempBan { @@ -57,7 +57,7 @@ public class TempBan { } catch (Exception ignored){} try { - guild.ban(target,purge ? 1 : 0,reason).queue(); + guild.ban(target,purge ? 1 : 0, TimeUnit.DAYS).reason(reason).queue(); } catch (Exception e){ return Response.error("Failed to temp ban user"); } diff --git a/src/main/java/net/tylermurphy/ken/command/moderation/UnBan.java b/src/main/java/net/tylermurphy/ken/command/moderation/UnBan.java index 84bce04..09723d4 100644 --- a/src/main/java/net/tylermurphy/ken/command/moderation/UnBan.java +++ b/src/main/java/net/tylermurphy/ken/command/moderation/UnBan.java @@ -3,6 +3,7 @@ package net.tylermurphy.ken.command.moderation; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; @@ -59,7 +60,7 @@ public class UnBan { } try { - guild.unban(target).queue(); + guild.unban(target).reason(reason).queue(); } catch (Exception e){ return Response.error("Failed to unban user"); } diff --git a/src/main/java/net/tylermurphy/ken/command/moderation/UnMute.java b/src/main/java/net/tylermurphy/ken/command/moderation/UnMute.java index abd34b2..5b05096 100644 --- a/src/main/java/net/tylermurphy/ken/command/moderation/UnMute.java +++ b/src/main/java/net/tylermurphy/ken/command/moderation/UnMute.java @@ -3,6 +3,7 @@ package net.tylermurphy.ken.command.moderation; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.Response; @@ -37,7 +38,7 @@ public class UnMute { } try { - guild.removeTimeout(target).queue(); + guild.removeTimeout(target).reason(reason).queue(); } catch (Exception e){ return Response.error("Failed to unmute user"); } diff --git a/src/main/java/net/tylermurphy/ken/command/music/ForceSkip.java b/src/main/java/net/tylermurphy/ken/command/music/ForceSkip.java index cf3e6ea..944446e 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/ForceSkip.java +++ b/src/main/java/net/tylermurphy/ken/command/music/ForceSkip.java @@ -3,6 +3,7 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.annotation.Command; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Join.java b/src/main/java/net/tylermurphy/ken/command/music/Join.java index b1dfa75..97d575e 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Join.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Join.java @@ -2,6 +2,7 @@ package net.tylermurphy.ken.command.music; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.annotation.Command; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Leave.java b/src/main/java/net/tylermurphy/ken/command/music/Leave.java index 5455554..c0aba50 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Leave.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Leave.java @@ -1,8 +1,8 @@ package net.tylermurphy.ken.command.music; -import net.dv8tion.jda.api.entities.AudioChannel; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.command.annotation.Command; import net.tylermurphy.ken.command.Response; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Loop.java b/src/main/java/net/tylermurphy/ken/command/music/Loop.java index bee99d7..8fc3e76 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Loop.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Loop.java @@ -1,9 +1,9 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import net.dv8tion.jda.api.entities.AudioChannel; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.annotation.Command; diff --git a/src/main/java/net/tylermurphy/ken/command/music/LoopQueue.java b/src/main/java/net/tylermurphy/ken/command/music/LoopQueue.java index 02d6432..84bbb25 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/LoopQueue.java +++ b/src/main/java/net/tylermurphy/ken/command/music/LoopQueue.java @@ -1,9 +1,9 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import net.dv8tion.jda.api.entities.AudioChannel; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.annotation.Command; diff --git a/src/main/java/net/tylermurphy/ken/command/music/NowPlaying.java b/src/main/java/net/tylermurphy/ken/command/music/NowPlaying.java index 24aaa5e..0546335 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/NowPlaying.java +++ b/src/main/java/net/tylermurphy/ken/command/music/NowPlaying.java @@ -4,6 +4,7 @@ import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.annotation.Command; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Pause.java b/src/main/java/net/tylermurphy/ken/command/music/Pause.java index d1e6e32..f7fbeaf 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Pause.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Pause.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import net.dv8tion.jda.api.entities.AudioChannel; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.managers.AudioManager; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Play.java b/src/main/java/net/tylermurphy/ken/command/music/Play.java index e7fd47b..0d95fe5 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Play.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Play.java @@ -3,6 +3,8 @@ package net.tylermurphy.ken.command.music; import com.google.api.services.youtube.model.SearchResult; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Remove.java b/src/main/java/net/tylermurphy/ken/command/music/Remove.java index d122bbb..353ac56 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Remove.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Remove.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import net.dv8tion.jda.api.entities.AudioChannel; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.interactions.commands.OptionType; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Resume.java b/src/main/java/net/tylermurphy/ken/command/music/Resume.java index 47595d2..8e082c8 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Resume.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Resume.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import net.dv8tion.jda.api.entities.AudioChannel; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.managers.AudioManager; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Skip.java b/src/main/java/net/tylermurphy/ken/command/music/Skip.java index a017170..3376252 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Skip.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Skip.java @@ -2,10 +2,10 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; -import net.dv8tion.jda.api.entities.AudioChannel; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.GuildMessageChannel; import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.command.annotation.Command; diff --git a/src/main/java/net/tylermurphy/ken/command/music/Stop.java b/src/main/java/net/tylermurphy/ken/command/music/Stop.java index 1c96c0b..105ac6f 100644 --- a/src/main/java/net/tylermurphy/ken/command/music/Stop.java +++ b/src/main/java/net/tylermurphy/ken/command/music/Stop.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.music; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import net.dv8tion.jda.api.entities.AudioChannel; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.managers.AudioManager; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/Danbooru.java b/src/main/java/net/tylermurphy/ken/command/nsfw/Danbooru.java index fd91ae1..23f3dc1 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/Danbooru.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/Danbooru.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/E621.java b/src/main/java/net/tylermurphy/ken/command/nsfw/E621.java index 1448083..f3c8d6d 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/E621.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/E621.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/Gelbooru.java b/src/main/java/net/tylermurphy/ken/command/nsfw/Gelbooru.java index 54cc042..85948e2 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/Gelbooru.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/Gelbooru.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/Hentai.java b/src/main/java/net/tylermurphy/ken/command/nsfw/Hentai.java index 5141b9d..6043ef3 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/Hentai.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/Hentai.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/Konachan.java b/src/main/java/net/tylermurphy/ken/command/nsfw/Konachan.java index 44afb4b..fd91e2d 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/Konachan.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/Konachan.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/Rule34.java b/src/main/java/net/tylermurphy/ken/command/nsfw/Rule34.java index f233267..4200f8b 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/Rule34.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/Rule34.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/Yandere.java b/src/main/java/net/tylermurphy/ken/command/nsfw/Yandere.java index f9475d4..f39ad51 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/Yandere.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/Yandere.java @@ -1,7 +1,7 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/command/nsfw/nHentai.java b/src/main/java/net/tylermurphy/ken/command/nsfw/nHentai.java index 4e8e138..8de510d 100644 --- a/src/main/java/net/tylermurphy/ken/command/nsfw/nHentai.java +++ b/src/main/java/net/tylermurphy/ken/command/nsfw/nHentai.java @@ -1,9 +1,9 @@ package net.tylermurphy.ken.command.nsfw; -import net.dv8tion.jda.api.entities.GuildMessageChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.tylermurphy.ken.Ken; import net.tylermurphy.ken.api.HTTPMethod; diff --git a/src/main/java/net/tylermurphy/ken/music/AutoLeaveManager.java b/src/main/java/net/tylermurphy/ken/music/AutoLeaveManager.java index 7ddbb84..d5d2b21 100644 --- a/src/main/java/net/tylermurphy/ken/music/AutoLeaveManager.java +++ b/src/main/java/net/tylermurphy/ken/music/AutoLeaveManager.java @@ -5,8 +5,7 @@ import java.util.TimerTask; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.MessageChannel; -import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.managers.AudioManager; import net.tylermurphy.ken.Ken; @@ -15,7 +14,6 @@ public class AutoLeaveManager extends ListenerAdapter { Timer timer; TimeoutTask task; - Guild guild; public AutoLeaveManager() { Ken.getInstance().addEventListener(this); @@ -47,9 +45,10 @@ class TimeoutTask extends TimerTask { this.manager = guild.getAudioManager(); } - private AudioManager manager; + private final AudioManager manager; + private final MessageChannel channel; + private long lastTime = 0; - private MessageChannel channel; public void run() { if(lastTime == 0) { diff --git a/src/main/java/net/tylermurphy/ken/music/GuildMusicManager.java b/src/main/java/net/tylermurphy/ken/music/GuildMusicManager.java index b96c5dd..e584dd5 100644 --- a/src/main/java/net/tylermurphy/ken/music/GuildMusicManager.java +++ b/src/main/java/net/tylermurphy/ken/music/GuildMusicManager.java @@ -4,16 +4,17 @@ import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.GuildMessageChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; public class GuildMusicManager { public final AudioPlayer player; public final TrackScheduler scheduler; - public GuildMessageChannel boundChannel; public final AutoLeaveManager autoLeaveManager; public final Guild guild; + public GuildMessageChannel boundChannel; + public GuildMusicManager(Guild guild, AudioPlayerManager manager) { player = manager.createPlayer(); scheduler = new TrackScheduler(player, guild); diff --git a/src/main/java/net/tylermurphy/ken/music/MusicPermissions.java b/src/main/java/net/tylermurphy/ken/music/MusicPermissions.java index 4513ab7..f0a86e7 100644 --- a/src/main/java/net/tylermurphy/ken/music/MusicPermissions.java +++ b/src/main/java/net/tylermurphy/ken/music/MusicPermissions.java @@ -2,9 +2,9 @@ package net.tylermurphy.ken.music; import java.util.List; -import net.dv8tion.jda.api.entities.AudioChannel; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; public class MusicPermissions { diff --git a/src/main/java/net/tylermurphy/ken/music/PlayerManager.java b/src/main/java/net/tylermurphy/ken/music/PlayerManager.java index f3615f9..4bb8c16 100644 --- a/src/main/java/net/tylermurphy/ken/music/PlayerManager.java +++ b/src/main/java/net/tylermurphy/ken/music/PlayerManager.java @@ -11,7 +11,7 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.GuildMessageChannel; +import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import net.dv8tion.jda.api.entities.User; import net.tylermurphy.ken.Ken; diff --git a/src/main/java/net/tylermurphy/ken/util/ModerationChecker.java b/src/main/java/net/tylermurphy/ken/util/ModerationChecker.java index e1577c3..ed0db13 100644 --- a/src/main/java/net/tylermurphy/ken/util/ModerationChecker.java +++ b/src/main/java/net/tylermurphy/ken/util/ModerationChecker.java @@ -2,11 +2,10 @@ package net.tylermurphy.ken.util; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.PrivateChannel; import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.tylermurphy.ken.Ken; -import net.tylermurphy.ken.database.ModerationTable; import org.json.JSONArray; import org.json.JSONObject;