diff --git a/pom.xml b/pom.xml index f86b2f3..59c5962 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.jagrosh Vortex - 2.3 + 2.4 jar @@ -24,12 +24,12 @@ net.dv8tion JDA - 3.8.3_464 + 4.0.0_52 com.jagrosh jda-utilities - 2.1.5 + 3.0.2 pom @@ -38,6 +38,11 @@ 0.3 + club.minnced + discord-webhooks + 0.1.8 + + ch.qos.logback logback-classic 1.2.3 diff --git a/src/main/java/com/jagrosh/vortex/Constants.java b/src/main/java/com/jagrosh/vortex/Constants.java index dc3fcad..b4a7937 100644 --- a/src/main/java/com/jagrosh/vortex/Constants.java +++ b/src/main/java/com/jagrosh/vortex/Constants.java @@ -16,7 +16,7 @@ package com.jagrosh.vortex; import java.time.OffsetDateTime; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/Listener.java b/src/main/java/com/jagrosh/vortex/Listener.java index 9502101..b01c424 100644 --- a/src/main/java/com/jagrosh/vortex/Listener.java +++ b/src/main/java/com/jagrosh/vortex/Listener.java @@ -19,25 +19,25 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import net.dv8tion.jda.core.JDA.ShardInfo; -import net.dv8tion.jda.core.entities.Message; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.events.Event; -import net.dv8tion.jda.core.events.ReadyEvent; -import net.dv8tion.jda.core.events.guild.GuildBanEvent; -import net.dv8tion.jda.core.events.guild.GuildUnbanEvent; -import net.dv8tion.jda.core.events.guild.member.*; -import net.dv8tion.jda.core.events.guild.voice.GuildVoiceJoinEvent; -import net.dv8tion.jda.core.events.guild.voice.GuildVoiceLeaveEvent; -import net.dv8tion.jda.core.events.guild.voice.GuildVoiceMoveEvent; -import net.dv8tion.jda.core.events.message.MessageBulkDeleteEvent; -import net.dv8tion.jda.core.events.message.guild.GuildMessageDeleteEvent; -import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent; -import net.dv8tion.jda.core.events.message.guild.GuildMessageUpdateEvent; -import net.dv8tion.jda.core.events.user.update.UserUpdateAvatarEvent; -import net.dv8tion.jda.core.events.user.update.UserUpdateDiscriminatorEvent; -import net.dv8tion.jda.core.events.user.update.UserUpdateNameEvent; -import net.dv8tion.jda.core.hooks.EventListener; +import net.dv8tion.jda.api.JDA.ShardInfo; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.events.GenericEvent; +import net.dv8tion.jda.api.events.ReadyEvent; +import net.dv8tion.jda.api.events.guild.GuildBanEvent; +import net.dv8tion.jda.api.events.guild.GuildUnbanEvent; +import net.dv8tion.jda.api.events.guild.member.*; +import net.dv8tion.jda.api.events.guild.voice.GuildVoiceJoinEvent; +import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent; +import net.dv8tion.jda.api.events.guild.voice.GuildVoiceMoveEvent; +import net.dv8tion.jda.api.events.message.MessageBulkDeleteEvent; +import net.dv8tion.jda.api.events.message.guild.GuildMessageDeleteEvent; +import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; +import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent; +import net.dv8tion.jda.api.events.user.update.UserUpdateAvatarEvent; +import net.dv8tion.jda.api.events.user.update.UserUpdateDiscriminatorEvent; +import net.dv8tion.jda.api.events.user.update.UserUpdateNameEvent; +import net.dv8tion.jda.api.hooks.EventListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ } @Override - public void onEvent(Event event) + public void onEvent(GenericEvent event) { if (event instanceof GuildMessageReceivedEvent) { diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java index 1ce6c3c..b031495 100644 --- a/src/main/java/com/jagrosh/vortex/Vortex.java +++ b/src/main/java/com/jagrosh/vortex/Vortex.java @@ -31,8 +31,8 @@ import com.jagrosh.vortex.automod.StrikeHandler; import com.jagrosh.vortex.commands.CommandExceptionListener; import java.util.concurrent.ScheduledExecutorService; -import net.dv8tion.jda.core.OnlineStatus; -import net.dv8tion.jda.core.entities.Game; +import net.dv8tion.jda.api.OnlineStatus; +import net.dv8tion.jda.api.entities.Game; import com.jagrosh.vortex.database.Database; import com.jagrosh.vortex.logging.BasicLogger; import com.jagrosh.vortex.logging.MessageCache; @@ -45,13 +45,9 @@ import com.typesafe.config.ConfigFactory; import java.util.EnumSet; import java.util.concurrent.TimeUnit; -import net.dv8tion.jda.bot.sharding.DefaultShardManagerBuilder; -import net.dv8tion.jda.bot.sharding.ShardManager; -import net.dv8tion.jda.core.entities.ChannelType; -import net.dv8tion.jda.core.exceptions.PermissionException; -import net.dv8tion.jda.core.utils.cache.CacheFlag; -import net.dv8tion.jda.webhook.WebhookClient; -import net.dv8tion.jda.webhook.WebhookClientBuilder; +import net.dv8tion.jda.api.entities.ChannelType; +import net.dv8tion.jda.api.exceptions.PermissionException; +import net.dv8tion.jda.api.utils.cache.CacheFlag; /** * @@ -103,8 +99,8 @@ new AboutCmd(), new InviteCmd(), new PingCommand(), - new RoleinfoCmd(), - new ServerinfoCmd(), + new RoleinfoCommand(), + new ServerinfoCommand(), new UserinfoCmd(), // Moderation diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java index 162c404..9206735 100644 --- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java +++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java @@ -35,11 +35,11 @@ import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.*; -import net.dv8tion.jda.core.entities.Guild.VerificationLevel; -import net.dv8tion.jda.core.events.guild.member.GuildMemberJoinEvent; -import net.dv8tion.jda.core.exceptions.PermissionException; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.Guild.VerificationLevel; +import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; +import net.dv8tion.jda.api.exceptions.PermissionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -295,7 +295,7 @@ if(offenses==settings.dupeDeleteThresh) { channelWarning = "Please stop spamming."; - purgeMessages(message.getGuild(), m -> m.getAuthorId()==message.getAuthor().getIdLong() && m.getCreationTime().plusMinutes(2).isAfter(now)); + purgeMessages(message.getGuild(), m -> m.getAuthorId()==message.getAuthor().getIdLong() && m.getTimeCreated().plusMinutes(2).isAfter(now)); } else if(offenses>settings.dupeDeleteThresh) shouldDelete = true; @@ -546,7 +546,7 @@ private static OffsetDateTime latestTime(Message m) { - return m.isEdited() ? m.getEditedTime() : m.getCreationTime(); + return m.isEdited() ? m.getEditedTime() : m.getTimeCreated(); } private class DupeStatus diff --git a/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java b/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java index a5e8af7..ae6bc20 100644 --- a/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java +++ b/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java @@ -16,8 +16,8 @@ package com.jagrosh.vortex.automod; import com.jagrosh.vortex.utils.FixedCache; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.entities.Invite; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.entities.Invite; /** * diff --git a/src/main/java/com/jagrosh/vortex/automod/StrikeHandler.java b/src/main/java/com/jagrosh/vortex/automod/StrikeHandler.java index ac12a9b..5580dcf 100644 --- a/src/main/java/com/jagrosh/vortex/automod/StrikeHandler.java +++ b/src/main/java/com/jagrosh/vortex/automod/StrikeHandler.java @@ -27,11 +27,11 @@ import java.time.temporal.ChronoUnit; import java.util.List; import java.util.concurrent.TimeUnit; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.User; +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.Role; +import net.dv8tion.jda.api.entities.User; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/LogCommand.java b/src/main/java/com/jagrosh/vortex/commands/LogCommand.java index 910b8e0..13942da 100644 --- a/src/main/java/com/jagrosh/vortex/commands/LogCommand.java +++ b/src/main/java/com/jagrosh/vortex/commands/LogCommand.java @@ -21,8 +21,8 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.utils.FormatUtil; import java.util.List; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/ModCommand.java b/src/main/java/com/jagrosh/vortex/commands/ModCommand.java index 98df964..9fcbadd 100644 --- a/src/main/java/com/jagrosh/vortex/commands/ModCommand.java +++ b/src/main/java/com/jagrosh/vortex/commands/ModCommand.java @@ -18,8 +18,8 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Role; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AnticopypastaCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AnticopypastaCmd.java index aa65ceb..dec757a 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AnticopypastaCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AnticopypastaCmd.java @@ -17,7 +17,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.AutomodManager; import com.jagrosh.vortex.database.managers.PunishmentManager; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java index 9901715..594430d 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java @@ -18,7 +18,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Constants; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.PunishmentManager; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java index 405fb99..18cea16 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java @@ -17,7 +17,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.AutomodManager; import com.jagrosh.vortex.database.managers.PunishmentManager; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AntiinviteCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AntiinviteCmd.java index 2face8c..e1953c3 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AntiinviteCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AntiinviteCmd.java @@ -17,7 +17,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.AutomodManager; import com.jagrosh.vortex.database.managers.PunishmentManager; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AntirefCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AntirefCmd.java index 755b834..27e352e 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AntirefCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AntirefCmd.java @@ -17,7 +17,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.AutomodManager; import com.jagrosh.vortex.database.managers.PunishmentManager; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AutodehoistCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AutodehoistCmd.java index 0634aaf..ed659ac 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AutodehoistCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AutodehoistCmd.java @@ -17,7 +17,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.automod.AutoMod; import com.jagrosh.vortex.commands.CommandExceptionListener; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/AutoraidmodeCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AutoraidmodeCmd.java index 945393f..337c9d5 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AutoraidmodeCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AutoraidmodeCmd.java @@ -19,7 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/BlacklistCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/BlacklistCmd.java index 103c32e..ebab9bd 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/BlacklistCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/BlacklistCmd.java @@ -18,7 +18,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java index f51ccc3..2cd0d92 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java @@ -22,9 +22,9 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.automod.Filter; import com.jagrosh.vortex.database.managers.PremiumManager; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.MessageEmbed.Field; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.MessageEmbed.Field; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/IgnoreCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/IgnoreCmd.java index f0beaf9..42dd3ad 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/IgnoreCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/IgnoreCmd.java @@ -9,10 +9,10 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; import java.util.List; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.utils.FormatUtil; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/MaxlinesCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/MaxlinesCmd.java index 913633f..0d566f6 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/MaxlinesCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/MaxlinesCmd.java @@ -17,7 +17,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.PunishmentManager; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/MaxmentionsCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/MaxmentionsCmd.java index 7a9ce2f..ca6d68d 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/MaxmentionsCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/MaxmentionsCmd.java @@ -19,7 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.database.managers.AutomodManager; import com.jagrosh.vortex.database.managers.PunishmentManager; diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java index e62588c..709f605 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java @@ -20,7 +20,7 @@ import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.PremiumManager; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/UnignoreCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/UnignoreCmd.java index 41787b1..7b40ae2 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/UnignoreCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/UnignoreCmd.java @@ -21,9 +21,9 @@ import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; import java.util.List; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; import com.jagrosh.vortex.utils.FormatUtil; /** diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java index cc19d9e..fa4ea31 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java @@ -18,7 +18,7 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java index 0e8f2a4..60d5449 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java @@ -21,11 +21,11 @@ import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.utils.FormatUtil; import java.awt.Color; -import net.dv8tion.jda.bot.sharding.ShardManager; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.JDAInfo; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.JDAInfo; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.sharding.ShardManager; /** * @@ -44,7 +44,7 @@ @Override protected void execute(CommandEvent event) { - ShardManager sm = event.getJDA().asBot().getShardManager(); + ShardManager sm = event.getJDA().getShardManager(); event.reply(new MessageBuilder() .setContent(Constants.VORTEX_EMOJI + " **All about Vortex** " + Constants.VORTEX_EMOJI) .setEmbed(new EmbedBuilder() @@ -54,7 +54,7 @@ + "Type `" + event.getClient().getPrefix() + event.getClient().getHelpWord() + "` for help and information.\n\n" + FormatUtil.helpLinks(event)) .addField("Stats", sm.getShardsTotal()+ " Shards\n" + sm.getGuildCache().size() + " Servers", true) - .addField("", sm.getUserCache().size() + " Users\n" + Math.round(sm.getAveragePing()) + "ms Avg Ping", true) + .addField("", sm.getUserCache().size() + " Users\n" + Math.round(sm.getAverageGatewayPing()) + "ms Avg Ping", true) .addField("", sm.getTextChannelCache().size() + " Text Channels\n" + sm.getVoiceChannelCache().size() + " Voice Channels", true) .setFooter("Last restart", null) .setTimestamp(event.getClient().getStartTime()) diff --git a/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java deleted file mode 100644 index 054be0c..0000000 --- a/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2016 John Grosh (jagrosh). - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.jagrosh.vortex.commands.general; - -import java.time.format.DateTimeFormatter; -import com.jagrosh.jdautilities.command.Command; -import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jdautilities.commons.utils.FinderUtil; -import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException; -import com.jagrosh.vortex.utils.FormatUtil; -import java.util.List; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; - -/** - * - * @author John Grosh (jagrosh) - */ -public class RoleinfoCmd extends Command -{ - private final static String LINESTART = "\u25AB"; // ▫ - private final static String ROLE_EMOJI = "\uD83C\uDFAD"; // 🎭 - - public RoleinfoCmd() - { - this.name = "roleinfo"; - this.aliases = new String[]{"rinfo","rankinfo"}; - this.help = "shows info about a role"; - this.arguments = ""; - this.guildOnly = true; - this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS}; - } - - @Override - protected void execute(CommandEvent event) - { - Role role; - if(event.getArgs().isEmpty()) - throw new CommandErrorException("Please provide the name of a role!"); - else - { - List found = FinderUtil.findRoles(event.getArgs(), event.getGuild()); - if(found.isEmpty()) - { - event.replyError("I couldn't find the role you were looking for!"); - return; - } - else if(found.size()>1) - { - event.replyWarning(FormatUtil.listOfRoles(found, event.getArgs())); - return; - } - else - { - role = found.get(0); - } - } - - String title = ROLE_EMOJI + " Information about **"+role.getName()+"**:"; - List list = role.isPublicRole() ? event.getGuild().getMembers() : event.getGuild().getMembersWithRoles(role); - StringBuilder desr = new StringBuilder(LINESTART+"ID: **"+role.getId()+"**\n" - + LINESTART+"Creation: **"+role.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" - + LINESTART+"Position: **"+role.getPosition()+"**\n" - + LINESTART+"Color: **#"+(role.getColor()==null ? "000000" : Integer.toHexString(role.getColor().getRGB()).toUpperCase().substring(2))+"**\n" - + LINESTART+"Mentionable: **"+role.isMentionable()+"**\n" - + LINESTART+"Hoisted: **"+role.isHoisted()+"**\n" - + LINESTART+"Managed: **"+role.isManaged()+"**\n" - + LINESTART+"Permissions: "); - if(role.getPermissions().isEmpty()) - desr.append("None"); - else - desr.append(role.getPermissions().stream().map(p -> "`, `"+p.getName()).reduce("", String::concat).substring(3)).append("`"); - desr.append("\n").append(LINESTART).append("Members: **").append(list.size()).append("**\n"); - if(list.size()*24<=2048-desr.length()) - list.forEach(m -> desr.append("<@").append(m.getUser().getId()).append("> ")); - - event.reply(new MessageBuilder() - .append(FormatUtil.filterEveryone(title)) - .setEmbed(new EmbedBuilder() - .setDescription(desr.toString().trim()) - .setColor(role.getColor()).build()) - .build()); - } -} diff --git a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java deleted file mode 100644 index 1d31d68..0000000 --- a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2016 John Grosh (jagrosh). - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.jagrosh.vortex.commands.general; - -import com.jagrosh.jdautilities.command.Command; -import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.vortex.utils.FormatUtil; -import java.time.format.DateTimeFormatter; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.OnlineStatus; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Guild; - -/** - * - * @author John Grosh (jagrosh) - */ -public class ServerinfoCmd extends Command -{ - private final static String LINESTART = "\u25AB"; // ▫ - private final static String GUILD_EMOJI = "\uD83D\uDDA5"; // 🖥 - private final static String NO_REGION = "\u2754"; // ❔ - - public ServerinfoCmd() - { - this.name = "serverinfo"; - this.aliases = new String[]{"server","guildinfo"}; - this.help = "shows server info"; - this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS}; - this.guildOnly = true; - } - - @Override - protected void execute(CommandEvent event) - { - Guild guild = event.getGuild(); - long onlineCount = guild.getMembers().stream().filter((u) -> (u.getOnlineStatus()!=OnlineStatus.OFFLINE)).count(); - long botCount = guild.getMembers().stream().filter(m -> m.getUser().isBot()).count(); - EmbedBuilder builder = new EmbedBuilder(); - String title = FormatUtil.filterEveryone(GUILD_EMOJI + " Information about **"+guild.getName()+"**:"); - String verif; - switch(guild.getVerificationLevel()) { - case VERY_HIGH: - verif = "┻━┻ミヽ(ಠ益ಠ)ノ彡┻━┻"; - break; - case HIGH: - verif = "(╯°□°）╯︵ ┻━┻"; - break; - default: - verif = guild.getVerificationLevel().name(); - break; - } - String str = LINESTART+"ID: **"+guild.getId()+"**\n" - +LINESTART+"Owner: "+FormatUtil.formatUser(guild.getOwner().getUser())+"\n" - +LINESTART+"Location: "+(guild.getRegion().getEmoji()==null ? NO_REGION : guild.getRegion().getEmoji())+" **"+guild.getRegion().getName()+"**\n" - +LINESTART+"Creation: **"+guild.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" - +LINESTART+"Users: **"+guild.getMemberCache().size()+"** ("+onlineCount+" online, "+botCount+" bots)\n" - +LINESTART+"Channels: **"+guild.getTextChannelCache().size()+"** Text, **"+guild.getVoiceChannelCache().size()+"** Voice, **"+guild.getCategoryCache().size()+"** Categories\n" - +LINESTART+"Verification: **"+verif+"**"; - if(!guild.getFeatures().isEmpty()) - str += "\n"+LINESTART+"Features: **"+String.join("**, **", guild.getFeatures())+"**"; - if(guild.getSplashId()!=null) - { - builder.setImage(guild.getSplashUrl()+"?size=1024"); - str += "\n"+LINESTART+"Splash: "; - } - if(guild.getIconUrl()!=null) - builder.setThumbnail(guild.getIconUrl()); - builder.setColor(guild.getOwner().getColor()); - builder.setDescription(str); - event.reply(new MessageBuilder().append(title).setEmbed(builder.build()).build()); - } -} diff --git a/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java index cec0145..13949c0 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java @@ -23,14 +23,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.OnlineStatus; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Game; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.User; -import net.dv8tion.jda.core.utils.MiscUtil; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.OnlineStatus; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.utils.MiscUtil; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java index f2e4b53..6a6efdf 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java @@ -19,7 +19,7 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.ArgsUtil.ResolvedArgs; import com.jagrosh.vortex.utils.FormatUtil; @@ -28,7 +28,7 @@ import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.entities.Role; /** * @@ -102,7 +102,7 @@ long uid = ids.get(i); String id = Long.toString(uid); boolean last = i+1 == ids.size(); - event.getGuild().getController().ban(id, 1, reason).queue(success -> + event.getGuild().ban(id, 1, reason).queue(success -> { builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully banned <@").append(id).append(">").append(time); if(minutes>0) diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/CheckCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/CheckCmd.java index 5616fcc..f19f07b 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/CheckCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/CheckCmd.java @@ -22,11 +22,11 @@ import com.jagrosh.vortex.commands.ModCommand; import com.jagrosh.vortex.utils.FormatUtil; import java.util.List; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Guild.Ban; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Guild.Ban; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.User; /** * @@ -87,7 +87,7 @@ if(event.getGuild().isMember(user)) check(event, user, null); else - event.getGuild().getBan(user).queue(ban -> check(event, user, ban), t -> check(event, user, null)); + event.getGuild().retrieveBan(user).queue(ban -> check(event, user, ban), t -> check(event, user, null)); } private void check(CommandEvent event, User user, Ban ban) diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java index 42e92da..ff47690 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java @@ -25,13 +25,13 @@ import com.jagrosh.vortex.commands.CommandExceptionListener.CommandWarningException; import com.jagrosh.vortex.commands.ModCommand; import java.util.LinkedList; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Message; -import net.dv8tion.jda.core.entities.MessageHistory; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.MessageHistory; import com.jagrosh.vortex.utils.LogUtil; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.entities.EmbedType; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.entities.EmbedType; +import net.dv8tion.jda.api.entities.TextChannel; /** * @@ -144,12 +144,12 @@ int val = val2; List msgs = new LinkedList<>(); MessageHistory mh = event.getChannel().getHistory(); - OffsetDateTime earliest = event.getMessage().getCreationTime().minusHours(335); + OffsetDateTime earliest = event.getMessage().getTimeCreated().minusHours(335); while(val>100) { msgs.addAll(mh.retrievePast(100).complete()); val-=100; - if(msgs.get(msgs.size()-1).getCreationTime().isBefore(earliest)) + if(msgs.get(msgs.size()-1).getTimeCreated().isBefore(earliest)) { val=0; break; @@ -163,7 +163,7 @@ List del = new LinkedList<>(); for(Message msg : msgs) { - if(msg.getCreationTime().isBefore(earliest)) + if(msg.getTimeCreated().isBefore(earliest)) { week2 = true; break; @@ -235,7 +235,7 @@ params = "all"; vortex.getTextUploader().upload(LogUtil.logMessagesBackwards("Cleaned Messages", del), "CleanedMessages", (view, download) -> { - vortex.getModLogger().postCleanCase(event.getMember(), event.getMessage().getCreationTime(), del.size(), + vortex.getModLogger().postCleanCase(event.getMember(), event.getMessage().getTimeCreated(), del.size(), event.getTextChannel(), params, null, new EmbedBuilder().setColor(event.getSelfMember().getColor()) .appendDescription("[`"+VIEW+" View`]("+view+") | [`"+DOWNLOAD+" Download`]("+download+")").build()); }); diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/KickCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/KickCmd.java index 96819fd..002fd55 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/KickCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/KickCmd.java @@ -19,13 +19,13 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Member; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; import java.util.List; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.entities.Role; /** * @@ -88,7 +88,7 @@ { Member m = toKick.get(i); boolean last = i+1 == toKick.size(); - event.getGuild().getController().kick(m, reason).queue(success -> + event.getGuild().kick(m, reason).queue(success -> { builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully kicked ").append(FormatUtil.formatUser(m.getUser())); if(last) diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/MuteCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/MuteCmd.java index 0962a5b..0893b67 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/MuteCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/MuteCmd.java @@ -20,9 +20,9 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; @@ -121,7 +121,7 @@ { Member m = toMute.get(i); boolean last = i+1 == toMute.size(); - event.getGuild().getController().addSingleRoleToMember(m, muteRole).reason(reason).queue(success -> + event.getGuild().addRoleToMember(m, muteRole).reason(reason).queue(success -> { builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully muted ").append(FormatUtil.formatUser(m.getUser())).append(time); if(minutes>0) diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/PardonCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/PardonCmd.java index 4eda900..9d975f6 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/PardonCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/PardonCmd.java @@ -21,7 +21,7 @@ import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.ArgsUtil.ResolvedArgs; import com.jagrosh.vortex.utils.FormatUtil; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * @@ -100,7 +100,7 @@ else { strikes = fnumstrikes1 ? parts[1] : null); + vortex.getAutoMod().disableRaidMode(event.getGuild(), event.getMember(), event.getMessage().getTimeCreated(), parts.length>1 ? parts[1] : null); event.replySuccess("Anti-Raid Mode has been disabled."); } else @@ -56,7 +56,7 @@ { if(!active) { - vortex.getAutoMod().enableRaidMode(event.getGuild(), event.getMember(), event.getMessage().getCreationTime(), parts.length>1 ? parts[1] : null); + vortex.getAutoMod().enableRaidMode(event.getGuild(), event.getMember(), event.getMessage().getTimeCreated(), parts.length>1 ? parts[1] : null); event.replySuccess("Anti-Raid Mode enabled. New members will be prevented from joining."); } else diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/ReasonCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/ReasonCmd.java index 8f96624..9714e28 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/ReasonCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/ReasonCmd.java @@ -18,7 +18,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/SoftbanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/SoftbanCmd.java index 851a5be..ed38e77 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/SoftbanCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/SoftbanCmd.java @@ -20,13 +20,13 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Member; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; import java.util.List; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.entities.Role; /** * @@ -90,10 +90,10 @@ { Member m = toSoftban.get(i); boolean last = i+1 == toSoftban.size(); - event.getGuild().getController().ban(m, 1, reason).queue(success -> + event.getGuild().ban(m, 1, reason).queue(success -> { builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully softbanned ").append(FormatUtil.formatUser(m.getUser())); - event.getGuild().getController().unban(m.getUser().getId()).reason(unbanreason).queueAfter(4, TimeUnit.SECONDS); + event.getGuild().unban(m.getUser().getId()).reason(unbanreason).queueAfter(4, TimeUnit.SECONDS); if(last) event.reply(builder.toString()); }, failure -> diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java index bb25ad7..358a61e 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java @@ -24,9 +24,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.User; /** * @@ -136,7 +136,7 @@ builder.append("\n").append(event.getClient().getError()).append(" Strikes cannot be given to bots (").append(FormatUtil.formatFullUser(u)).append(")"); else { - vortex.getStrikeHandler().applyStrikes(event.getMember(), event.getMessage().getCreationTime(), u, numstrikes, reason); + vortex.getStrikeHandler().applyStrikes(event.getMember(), event.getMessage().getTimeCreated(), u, numstrikes, reason); builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully gave `").append(numstrikes) .append("` strikes to ").append(FormatUtil.formatUser(u)); } diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java index e7dc8f2..cca6430 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/UnbanCmd.java @@ -18,14 +18,14 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.ArgsUtil.ResolvedArgs; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; import java.util.LinkedList; import java.util.List; -import net.dv8tion.jda.core.entities.Guild.Ban; +import net.dv8tion.jda.api.entities.Guild.Ban; /** * @@ -55,7 +55,7 @@ String reason = LogUtil.auditReasonFormat(event.getMember(), args.reason); StringBuilder builder = new StringBuilder(); - event.getGuild().getBanList().queue(list -> + event.getGuild().retrieveBanList().queue(list -> { List toUnban = new LinkedList<>(); args.members.forEach(m -> args.users.add(m.getUser())); @@ -90,7 +90,7 @@ { Ban ban = toUnban.get(i); boolean last = i+1 == toUnban.size(); - event.getGuild().getController().unban(ban.getUser()).reason(reason).queue(success -> + event.getGuild().unban(ban.getUser()).reason(reason).queue(success -> { builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully unbanned ").append(FormatUtil.formatUser(ban.getUser())); if(last) diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/UnmuteCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/UnmuteCmd.java index 93d4601..4469dfd 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/UnmuteCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/UnmuteCmd.java @@ -19,9 +19,9 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; @@ -104,7 +104,7 @@ { Member m = toUnmute.get(i); boolean last = i+1 == toUnmute.size(); - event.getGuild().getController().removeSingleRoleFromMember(m, muteRole).reason(reason).queue(success -> + event.getGuild().removeRoleFromMember(m, muteRole).reason(reason).queue(success -> { builder.append("\n").append(event.getClient().getSuccess()).append(" Successfully unmuted ").append(FormatUtil.formatUser(m.getUser())); if(last) diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/VoicekickCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/VoicekickCmd.java index 819ca14..3dd86ea 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/VoicekickCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/VoicekickCmd.java @@ -20,14 +20,14 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException; import com.jagrosh.vortex.commands.ModCommand; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Member; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; import com.jagrosh.vortex.utils.ArgsUtil; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; import java.util.List; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.VoiceChannel; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.VoiceChannel; /** * @@ -94,24 +94,12 @@ // do this async because its a nightmare to do it sync event.async(() -> { - VoiceChannel vc; - try - { - vc = (VoiceChannel)event.getGuild().getController().createVoiceChannel("Voice Kick Channel") - .setParent(toKick.get(0).getVoiceState().getChannel().getParent()).reason(reason).complete(); - } - catch(Exception ex) - { - builder.append("\n").append(event.getClient().getError()).append(" Failed to create a voice kick channel."); - event.reply(builder.toString()); - return; - } for(int i=0; i { event.getGuild().getAudioManager().closeAudioConnection(); - e.getChannelLeft().getMembers().stream().forEach(m -> event.getGuild().getController().moveVoiceMember(m, e.getChannelJoined()).queue()); + e.getChannelLeft().getMembers().stream().forEach(m -> event.getGuild().moveVoiceMember(m, e.getChannelJoined()).queue()); }, 1, TimeUnit.MINUTES, () -> { event.getGuild().getAudioManager().closeAudioConnection(); event.replyWarning("You waited too long, "+event.getMember().getAsMention()); diff --git a/src/main/java/com/jagrosh/vortex/commands/owner/DebugCmd.java b/src/main/java/com/jagrosh/vortex/commands/owner/DebugCmd.java index 9cc597c..12370a4 100644 --- a/src/main/java/com/jagrosh/vortex/commands/owner/DebugCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/owner/DebugCmd.java @@ -22,7 +22,7 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.utils.FormatUtil; import java.time.temporal.ChronoUnit; -import net.dv8tion.jda.core.JDA; +import net.dv8tion.jda.api.JDA; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java b/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java index 4524f9c..c91ffe7 100644 --- a/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java @@ -23,7 +23,7 @@ import com.jagrosh.vortex.database.managers.PremiumManager.PremiumInfo; import com.jagrosh.vortex.utils.OtherUtil; import java.time.temporal.ChronoUnit; -import net.dv8tion.jda.core.entities.Guild; +import net.dv8tion.jda.api.entities.Guild; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/owner/TransferCmd.java b/src/main/java/com/jagrosh/vortex/commands/owner/TransferCmd.java index e4466ee..6351704 100644 --- a/src/main/java/com/jagrosh/vortex/commands/owner/TransferCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/owner/TransferCmd.java @@ -22,8 +22,8 @@ import java.nio.file.Paths; import java.util.HashMap; import java.util.List; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java index 4d5126e..ce0fdec 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/AvatarlogCmd.java @@ -20,7 +20,7 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.LogCommand; import com.jagrosh.vortex.database.managers.PremiumManager; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/MessagelogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/MessagelogCmd.java index ad66078..c122ce1 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/MessagelogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/MessagelogCmd.java @@ -18,7 +18,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.LogCommand; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/ModlogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/ModlogCmd.java index 62223c7..ba6a12a 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/ModlogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/ModlogCmd.java @@ -18,8 +18,8 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.LogCommand; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/ModroleCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/ModroleCmd.java index 8436707..011c76d 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/ModroleCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/ModroleCmd.java @@ -21,8 +21,8 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.utils.FormatUtil; import java.util.List; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Role; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/PrefixCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/PrefixCmd.java index 90d31bd..bad623e 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/PrefixCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/PrefixCmd.java @@ -20,7 +20,7 @@ import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.GuildSettingsDataManager; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/PunishmentCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/PunishmentCmd.java index 350317c..0554479 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/PunishmentCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/PunishmentCmd.java @@ -24,9 +24,9 @@ import com.jagrosh.vortex.database.managers.PunishmentManager; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.OtherUtil; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java index 82d23c4..01ae4e2 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java @@ -18,7 +18,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.LogCommand; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java index ad65645..3328dfb 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java @@ -21,9 +21,9 @@ import com.jagrosh.vortex.database.managers.PremiumManager; import com.jagrosh.vortex.database.managers.PremiumManager.PremiumInfo; import java.time.Instant; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java index 7ca5235..559ebdc 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java @@ -22,11 +22,11 @@ import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.AutomodManager.AutomodSettings; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.PermissionOverride; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.TextChannel; -import net.dv8tion.jda.core.entities.VoiceChannel; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.PermissionOverride; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.VoiceChannel; /** * @@ -197,7 +197,7 @@ sb.append(Constants.SUCCESS+" Role initialized!\n"); m.editMessage(sb + Constants.LOADING+" Making Category overrides...").complete(); PermissionOverride po; - for(net.dv8tion.jda.core.entities.Category cat: event.getGuild().getCategories()) + for(net.dv8tion.jda.api.entities.Category cat: event.getGuild().getCategories()) { po = cat.getPermissionOverride(mutedRole); if(po==null) diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/TimezoneCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/TimezoneCmd.java index 311d50f..47bd3fd 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/TimezoneCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/TimezoneCmd.java @@ -20,7 +20,7 @@ import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; import java.time.ZoneId; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/VoicelogCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/VoicelogCmd.java index b104a74..8b62082 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/VoicelogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/VoicelogCmd.java @@ -18,7 +18,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.commands.LogCommand; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java index cbd3186..1dc6f6b 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java @@ -23,9 +23,9 @@ import com.jagrosh.vortex.commands.CommandExceptionListener.CommandWarningException; import com.jagrosh.vortex.utils.FormatUtil; import java.util.List; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java index 90b31a6..aca09dd 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java @@ -18,22 +18,21 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; -import com.jagrosh.vortex.Action; import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException; import com.jagrosh.vortex.commands.CommandExceptionListener.CommandWarningException; import com.jagrosh.vortex.utils.FormatUtil; import java.time.format.DateTimeFormatter; import java.util.List; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.audit.ActionType; -import net.dv8tion.jda.core.entities.Emote; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.TextChannel; -import net.dv8tion.jda.core.entities.User; -import net.dv8tion.jda.core.requests.restaction.pagination.AuditLogPaginationAction; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.audit.ActionType; +import net.dv8tion.jda.api.entities.Emote; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.requests.restaction.pagination.AuditLogPaginationAction; /** * @@ -67,7 +66,7 @@ protected void execute(CommandEvent event) { String[] parts = event.getArgs().split("\\s+", 2); - AuditLogPaginationAction action = event.getGuild().getAuditLogs().cache(false).limit(10); + AuditLogPaginationAction action = event.getGuild().retrieveAuditLogs().cache(false).limit(10); switch(parts[0].toLowerCase()) { case "all": @@ -168,7 +167,7 @@ }); if(ale.getReason()!=null) sb.append("\n").append(LINESTART).append("Reason: ").append(ale.getReason()); - sb.append("\n").append(LINESTART).append("Time: **").append(ale.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)).append("**\n\u200B"); + sb.append("\n").append(LINESTART).append("Time: **").append(ale.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)).append("**\n\u200B"); String str = sb.length()>1024 ? sb.substring(0,1020)+" ..." : sb.toString(); eb.addField(actionToEmote(ale.getType())+" "+fixCase(ale.getType().name()), str, true); }); diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/DehoistCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/DehoistCmd.java index aaafff4..e3dcc91 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/DehoistCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/DehoistCmd.java @@ -19,7 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.commands.CommandExceptionListener.CommandErrorException; import com.jagrosh.vortex.utils.OtherUtil; -import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.api.Permission; /** * diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java index 1bdce00..bc48c86 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Invite; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Invite; /** * @@ -77,7 +77,7 @@ private void pruneInvites(int uses, CommandEvent event) { event.getChannel().sendTyping().queue(); - event.getGuild().getInvites().queue(list -> + event.getGuild().retrieveInvites().queue(list -> { List toPrune = list.stream().filter(i -> i.getInviter()!=null && !i.getInviter().isBot() && i.getUses()<=uses).collect(Collectors.toList()); toPrune.forEach(i -> i.delete().queue()); diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java index 0d75c25..fdb9acf 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java @@ -19,15 +19,15 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import java.time.format.DateTimeFormatter; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.entities.ChannelType; -import net.dv8tion.jda.core.entities.Invite; -import net.dv8tion.jda.core.entities.User; -import net.dv8tion.jda.core.exceptions.RateLimitedException; -import net.dv8tion.jda.core.utils.MiscUtil; -import net.dv8tion.jda.core.utils.WidgetUtil; -import net.dv8tion.jda.core.utils.WidgetUtil.Widget; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.entities.ChannelType; +import net.dv8tion.jda.api.entities.Invite; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.exceptions.RateLimitedException; +import net.dv8tion.jda.api.utils.MiscUtil; +import net.dv8tion.jda.api.utils.WidgetUtil; +import net.dv8tion.jda.api.utils.WidgetUtil.Widget; /** * @@ -82,7 +82,7 @@ String str = LINESTART+"Discord ID: **"+u.getId()+"**"; if(u.getAvatarId()!=null && u.getAvatarId().startsWith("a_")) str+= " <:nitro:314068430611415041>"; - str+="\n"+LINESTART+"Account Creation: **"+MiscUtil.getDateTimeString(u.getCreationTime())+"**"; + str+="\n"+LINESTART+"Account Creation: **"+MiscUtil.getDateTimeString(u.getTimeCreated())+"**"; eb.setDescription(str); event.reply(new MessageBuilder().append(text).setEmbed(eb.build()).build()); return; @@ -108,7 +108,7 @@ String text = GUILD_EMOJI + " Information about **"+widget.getName()+"**:"; EmbedBuilder eb = new EmbedBuilder(); String str = LINESTART+"ID: **"+widget.getId()+"**\n" - +LINESTART+"Creation: **"+widget.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" + +LINESTART+"Creation: **"+widget.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" +LINESTART+"Channels: **"+widget.getVoiceChannels().size()+"** Voice\n" +LINESTART+"Users: **"+widget.getMembers().size()+"** online\n"; if(inv!=null) @@ -164,7 +164,7 @@ + LINESTART+"Inviter: "+(inv.getInviter()==null?"N/A":"**"+inv.getInviter().getName()+"**#"+inv.getInviter().getDiscriminator()+" (ID:"+inv.getInviter().getId()+")"); eb.setDescription(str); str = LINESTART+"ID: **"+inv.getGuild().getId()+"**\n" - +LINESTART+"Creation: **"+inv.getGuild().getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n"; + +LINESTART+"Creation: **"+inv.getGuild().getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n"; if(widget!=null && widget.isAvailable()) str += LINESTART+"Channels: **"+widget.getVoiceChannels().size()+"** Voice\n" +LINESTART+"Users: **"+widget.getMembers().size()+"** online"; diff --git a/src/main/java/com/jagrosh/vortex/database/managers/AuditCacheManager.java b/src/main/java/com/jagrosh/vortex/database/managers/AuditCacheManager.java index 6d41db1..c3604fa 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/AuditCacheManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/AuditCacheManager.java @@ -21,7 +21,7 @@ import com.jagrosh.easysql.columns.LongColumn; import java.util.LinkedList; import java.util.List; -import net.dv8tion.jda.core.audit.AuditLogEntry; +import net.dv8tion.jda.api.audit.AuditLogEntry; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java b/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java index c30aef7..e9647e0 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java @@ -23,8 +23,8 @@ import com.jagrosh.vortex.utils.FixedCache; import java.sql.ResultSet; import java.sql.SQLException; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.MessageEmbed.Field; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.MessageEmbed.Field; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java b/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java index c697d3f..58ea5b2 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java @@ -24,8 +24,8 @@ import com.jagrosh.vortex.utils.FixedCache; import java.util.ArrayList; import java.util.List; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.MessageEmbed.Field; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.MessageEmbed.Field; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java index a5ab372..e1e49ab 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java @@ -29,11 +29,11 @@ import java.time.zone.ZoneRulesException; import java.util.Collection; import java.util.Collections; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Guild.VerificationLevel; -import net.dv8tion.jda.core.entities.MessageEmbed.Field; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Guild.VerificationLevel; +import net.dv8tion.jda.api.entities.MessageEmbed.Field; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java b/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java index 6ffc990..577eb47 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java @@ -24,10 +24,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java b/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java index 18032d4..cd9bd7a 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java @@ -5,7 +5,7 @@ import com.jagrosh.easysql.SQLColumn; import com.jagrosh.easysql.columns.LongColumn; import com.jagrosh.vortex.utils.FixedCache; -import net.dv8tion.jda.core.entities.Guild; +import net.dv8tion.jda.api.entities.Guild; import org.slf4j.LoggerFactory; import java.sql.PreparedStatement; diff --git a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java index bdf353c..d34e679 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java @@ -27,7 +27,7 @@ import java.time.temporal.TemporalUnit; import java.util.LinkedList; import java.util.List; -import net.dv8tion.jda.core.entities.Guild; +import net.dv8tion.jda.api.entities.Guild; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/PunishmentManager.java b/src/main/java/com/jagrosh/vortex/database/managers/PunishmentManager.java index 5548697..071034b 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/PunishmentManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/PunishmentManager.java @@ -28,8 +28,8 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.MessageEmbed.Field; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.MessageEmbed.Field; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/StrikeManager.java b/src/main/java/com/jagrosh/vortex/database/managers/StrikeManager.java index 9ab516d..9af8e04 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/StrikeManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/StrikeManager.java @@ -19,8 +19,8 @@ import com.jagrosh.easysql.DatabaseConnector; import com.jagrosh.easysql.SQLColumn; import com.jagrosh.easysql.columns.*; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; /** * diff --git a/src/main/java/com/jagrosh/vortex/database/managers/TempBanManager.java b/src/main/java/com/jagrosh/vortex/database/managers/TempBanManager.java index 026682b..06ad346 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/TempBanManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/TempBanManager.java @@ -22,9 +22,9 @@ import com.jagrosh.easysql.columns.LongColumn; import java.time.Instant; import java.time.temporal.ChronoUnit; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Guild; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Guild; /** * @@ -101,7 +101,7 @@ Guild g = jda.getGuildById(GUILD_ID.getValue(rs)); if(g==null || !g.isAvailable() || !g.getSelfMember().hasPermission(Permission.BAN_MEMBERS)) continue; - g.getController().unban(Long.toString(USER_ID.getValue(rs))).reason("Temporary Ban Completed").queue(s->{}, f->{}); + g.unban(Long.toString(USER_ID.getValue(rs))).reason("Temporary Ban Completed").queue(s->{}, f->{}); rs.deleteRow(); } }); diff --git a/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java b/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java index ba73d6b..16b7f6b 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java @@ -20,14 +20,13 @@ import com.jagrosh.easysql.SQLColumn; import com.jagrosh.easysql.columns.InstantColumn; import com.jagrosh.easysql.columns.LongColumn; -import com.jagrosh.vortex.utils.OtherUtil; import java.time.Instant; import java.time.temporal.ChronoUnit; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Role; +import net.dv8tion.jda.api.JDA; +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.Role; /** * @@ -141,7 +140,7 @@ } Member m = g.getMemberById(USER_ID.getValue(rs)); if(m!=null && m.getRoles().contains(mRole)) - g.getController().removeSingleRoleFromMember(m, mRole).reason("Temporary Mute Completed").queue(); + g.removeRoleFromMember(m, mRole).reason("Temporary Mute Completed").queue(); rs.deleteRow(); } }); diff --git a/src/main/java/com/jagrosh/vortex/logging/AvatarSaver.java b/src/main/java/com/jagrosh/vortex/logging/AvatarSaver.java index f3aae14..cb63d8a 100644 --- a/src/main/java/com/jagrosh/vortex/logging/AvatarSaver.java +++ b/src/main/java/com/jagrosh/vortex/logging/AvatarSaver.java @@ -25,7 +25,7 @@ import java.net.URL; import java.net.URLConnection; import javax.imageio.ImageIO; -import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.api.entities.User; /** * diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java index a4b48c6..fd17caf 100644 --- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java @@ -26,19 +26,19 @@ import java.time.temporal.ChronoUnit; import java.util.List; import java.util.stream.Collectors; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.*; -import net.dv8tion.jda.core.events.guild.member.GuildMemberJoinEvent; -import net.dv8tion.jda.core.events.guild.member.GuildMemberLeaveEvent; -import net.dv8tion.jda.core.events.guild.voice.GuildVoiceJoinEvent; -import net.dv8tion.jda.core.events.guild.voice.GuildVoiceLeaveEvent; -import net.dv8tion.jda.core.events.guild.voice.GuildVoiceMoveEvent; -import net.dv8tion.jda.core.events.user.update.UserUpdateAvatarEvent; -import net.dv8tion.jda.core.events.user.update.UserUpdateDiscriminatorEvent; -import net.dv8tion.jda.core.events.user.update.UserUpdateNameEvent; -import net.dv8tion.jda.core.exceptions.PermissionException; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; +import net.dv8tion.jda.api.events.guild.member.GuildMemberLeaveEvent; +import net.dv8tion.jda.api.events.guild.voice.GuildVoiceJoinEvent; +import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent; +import net.dv8tion.jda.api.events.guild.voice.GuildVoiceMoveEvent; +import net.dv8tion.jda.api.events.user.update.UserUpdateAvatarEvent; +import net.dv8tion.jda.api.events.user.update.UserUpdateDiscriminatorEvent; +import net.dv8tion.jda.api.events.user.update.UserUpdateNameEvent; +import net.dv8tion.jda.api.exceptions.PermissionException; /** * @@ -116,7 +116,7 @@ edit.addField("To:", newm.length()>1024 ? newm.substring(0,1016)+" (...)" : newm, false); else edit.appendDescription("\n**To:** "+newm); - log(newMessage.getEditedTime()==null ? newMessage.getCreationTime() : newMessage.getEditedTime(), tc, EDIT, + log(newMessage.getTimeEdited()==null ? newMessage.getTimeCreated(): newMessage.getTimeEdited(), tc, EDIT, FormatUtil.formatFullUser(newMessage.getAuthor())+" edited a message in "+newMessage.getTextChannel().getAsMention()+":", edit.build()); } @@ -230,10 +230,10 @@ if(tc==null) return; OffsetDateTime now = OffsetDateTime.now(); - long seconds = event.getUser().getCreationTime().until(now, ChronoUnit.SECONDS); + long seconds = event.getUser().getTimeCreated().until(now, ChronoUnit.SECONDS); log(now, tc, JOIN, FormatUtil.formatFullUser(event.getUser())+" joined the server. " +(seconds<16*60 ? NEW : "") - +"\nCreation: "+event.getUser().getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+" ("+FormatUtil.secondsToTimeCompact(seconds)+" ago)", null); + +"\nCreation: "+event.getUser().getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)+" ("+FormatUtil.secondsToTimeCompact(seconds)+" ago)", null); } public void logGuildLeave(GuildMemberLeaveEvent event) @@ -242,7 +242,7 @@ if(tc==null) return; OffsetDateTime now = OffsetDateTime.now(); - long seconds = event.getMember().getJoinDate().until(now, ChronoUnit.SECONDS); + long seconds = event.getMember().getTimeJoined().until(now, ChronoUnit.SECONDS); StringBuilder rlist; if(event.getMember().getRoles().isEmpty()) rlist = new StringBuilder(); @@ -254,7 +254,7 @@ rlist.append("`"); } log(now, tc, LEAVE, FormatUtil.formatFullUser(event.getUser())+" left or was kicked from the server. " - +"\nJoined: "+event.getMember().getJoinDate().format(DateTimeFormatter.RFC_1123_DATE_TIME)+" ("+FormatUtil.secondsToTimeCompact(seconds)+" ago)" + +"\nJoined: "+event.getMember().getTimeJoined().format(DateTimeFormatter.RFC_1123_DATE_TIME)+" ("+FormatUtil.secondsToTimeCompact(seconds)+" ago)" +rlist.toString(), null); } diff --git a/src/main/java/com/jagrosh/vortex/logging/MessageCache.java b/src/main/java/com/jagrosh/vortex/logging/MessageCache.java index 7835068..965c6d1 100644 --- a/src/main/java/com/jagrosh/vortex/logging/MessageCache.java +++ b/src/main/java/com/jagrosh/vortex/logging/MessageCache.java @@ -21,9 +21,9 @@ import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; -import net.dv8tion.jda.bot.sharding.ShardManager; -import net.dv8tion.jda.core.entities.*; -import net.dv8tion.jda.core.entities.Message.Attachment; +import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.entities.Message.Attachment; +import net.dv8tion.jda.api.sharding.ShardManager; /** * @@ -69,7 +69,7 @@ username = message.getAuthor().getName(); discriminator = message.getAuthor().getDiscriminator(); channel = message.getChannel().getIdLong(); - guild = message.getGuild()==null ? 0L : message.getGuild().getIdLong(); + guild = message.isFromGuild() ? message.getGuild().getIdLong() : 0L; attachments = message.getAttachments(); } diff --git a/src/main/java/com/jagrosh/vortex/logging/ModLogger.java b/src/main/java/com/jagrosh/vortex/logging/ModLogger.java index 7b1b794..9faa9ec 100644 --- a/src/main/java/com/jagrosh/vortex/logging/ModLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/ModLogger.java @@ -33,13 +33,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.audit.AuditLogChange; -import net.dv8tion.jda.core.audit.AuditLogEntry; -import net.dv8tion.jda.core.audit.AuditLogKey; -import net.dv8tion.jda.core.entities.*; -import net.dv8tion.jda.core.exceptions.PermissionException; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.audit.AuditLogChange; +import net.dv8tion.jda.api.audit.AuditLogEntry; +import net.dv8tion.jda.api.audit.AuditLogKey; +import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.exceptions.PermissionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -285,7 +285,7 @@ if(act==Action.UNBAN) // check for softban { Message banMsg = banLogCache.get(banCacheKey); - if(banMsg!=null && banMsg.getCreationTime().plusMinutes(2).isAfter(ale.getCreationTime())) + if(banMsg!=null && banMsg.getTimeCreated().plusMinutes(2).isAfter(ale.getTimeCreated())) { // This is a softban, because the user was banned by the same mod within the past 2 minutes // We need to edit the existing modlog entry instead of making a new one @@ -301,8 +301,8 @@ vortex.getDatabase().tempmutes.removeMute(guild, ale.getTargetIdLong()); } String msg = FormatUtil.filterEveryone(minutes > 0 ? - LogUtil.modlogTimeFormat(ale.getCreationTime(), timezone, getCaseNumber(modlog), mod, act, minutes, target, reason) : - LogUtil.modlogUserFormat(ale.getCreationTime(), timezone, getCaseNumber(modlog), mod, act, target, reason)); + LogUtil.modlogTimeFormat(ale.getTimeCreated(), timezone, getCaseNumber(modlog), mod, act, minutes, target, reason) : + LogUtil.modlogUserFormat(ale.getTimeCreated(), timezone, getCaseNumber(modlog), mod, act, target, reason)); if(act==Action.BAN) banLogCache.put(banCacheKey, modlog.sendMessage(msg).complete()); else diff --git a/src/main/java/com/jagrosh/vortex/logging/TextUploader.java b/src/main/java/com/jagrosh/vortex/logging/TextUploader.java index 2069816..c58646c 100644 --- a/src/main/java/com/jagrosh/vortex/logging/TextUploader.java +++ b/src/main/java/com/jagrosh/vortex/logging/TextUploader.java @@ -18,10 +18,9 @@ import com.jagrosh.vortex.Vortex; import java.nio.charset.StandardCharsets; import java.util.List; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.entities.Category; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.entities.Category; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.TextChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/jagrosh/vortex/utils/ArgsUtil.java b/src/main/java/com/jagrosh/vortex/utils/ArgsUtil.java index f8bffe1..f07b34d 100644 --- a/src/main/java/com/jagrosh/vortex/utils/ArgsUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/ArgsUtil.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.User; /** * diff --git a/src/main/java/com/jagrosh/vortex/utils/BlockingSessionController.java b/src/main/java/com/jagrosh/vortex/utils/BlockingSessionController.java index 8fb5d9a..979f669 100644 --- a/src/main/java/com/jagrosh/vortex/utils/BlockingSessionController.java +++ b/src/main/java/com/jagrosh/vortex/utils/BlockingSessionController.java @@ -15,9 +15,9 @@ */ package com.jagrosh.vortex.utils; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.utils.JDALogger; -import net.dv8tion.jda.core.utils.SessionControllerAdapter; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.utils.SessionControllerAdapter; +import net.dv8tion.jda.internal.utils.JDALogger; /** * diff --git a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java index e8344c0..d467911 100644 --- a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java @@ -18,9 +18,9 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import java.util.List; -import net.dv8tion.jda.core.entities.Role; -import net.dv8tion.jda.core.entities.User; -import net.dv8tion.jda.core.entities.VoiceChannel; +import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.entities.VoiceChannel; import com.jagrosh.vortex.Constants; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.logging.MessageCache.CachedMessage; @@ -28,11 +28,11 @@ import java.util.Collections; import java.util.function.Function; import java.util.stream.Collectors; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Message; -import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.TextChannel; /** * diff --git a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java index fec361f..b492b5f 100644 --- a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java @@ -23,12 +23,12 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.dv8tion.jda.bot.sharding.ShardManager; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.Message; -import net.dv8tion.jda.core.entities.TextChannel; -import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.sharding.ShardManager; /** * @@ -124,7 +124,7 @@ { m = messages.get(i); sb.append("\r\n\r\n[") - .append(m.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)) + .append(m.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)) .append("] ").append(m.getAuthor().getName()).append("#").append(m.getAuthor().getDiscriminator()) .append(" (").append(m.getAuthor().getId()).append(") : ").append(m.getContentRaw()); m.getAttachments().forEach(att -> sb.append("\n").append(att.getUrl())); @@ -143,7 +143,7 @@ m = messages.get(i); User author = m.getAuthor(shardManager); sb.append("\r\n\r\n[") - .append(m.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)) + .append(m.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)) .append("] "); if(author==null) sb.append(m.getUsername()).append("#").append(m.getDiscriminator()).append(" (").append(m.getAuthorId()); @@ -165,7 +165,7 @@ { m = messages.get(i); sb.append("\r\n\r\n[") - .append(m.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)) + .append(m.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)) .append("] ").append(m.getAuthor().getName()).append("#").append(m.getAuthor().getDiscriminator()) .append(" (").append(m.getAuthor().getId()).append(") : ").append(m.getContentRaw()); m.getAttachments().forEach(att -> sb.append("\n").append(att.getUrl())); diff --git a/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java b/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java index 6a18409..1acf3d3 100644 --- a/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java @@ -20,9 +20,9 @@ import java.nio.file.Paths; import java.util.List; import java.util.stream.Collectors; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.User; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ break; } } - m.getGuild().getController().setNickname(m, newname).reason("Dehoisting").queue(); + m.modifyNickname(newname).reason("Dehoisting").queue(); return true; }