diff --git a/pom.xml b/pom.xml index 31e5cb7..6d92885 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.2.0_212 com.jagrosh jda-utilities - 2.1.5 + 3.0.4 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 0a75657..322da7a 100644 --- a/src/main/java/com/jagrosh/vortex/Constants.java +++ b/src/main/java/com/jagrosh/vortex/Constants.java @@ -16,7 +16,9 @@ package com.jagrosh.vortex; import java.time.OffsetDateTime; -import net.dv8tion.jda.core.Permission; +import java.util.EnumSet; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.requests.GatewayIntent; /** * @@ -39,6 +41,8 @@ Permission.MESSAGE_WRITE,Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_HISTORY, Permission.MESSAGE_EXT_EMOJI, Permission.MESSAGE_MANAGE, Permission.VOICE_CONNECT, Permission.VOICE_MOVE_OTHERS, Permission.VOICE_DEAF_OTHERS, Permission.VOICE_MUTE_OTHERS, Permission.NICKNAME_CHANGE, Permission.NICKNAME_MANAGE, Permission.VIEW_AUDIT_LOGS}; + public final static EnumSet INTENTS = EnumSet.of(GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_BANS, GatewayIntent.GUILD_INVITES, + GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES); public final static String SERVER_INVITE = "https://discord.gg/0p9LSGoRLu6Pet0k"; //public final static String BOT_INVITE = "https://discordapp.com/oauth2/authorize?client_id=240254129333731328&scope=bot&permissions="+Permission.getRaw(PERMISSIONS); // public final static String BOT_INVITE = "https://discordapp.com/oauth2/authorize?client_id=169463754382114816&scope=bot&permissions="+Permission.getRaw(PERMISSIONS); diff --git a/src/main/java/com/jagrosh/vortex/Listener.java b/src/main/java/com/jagrosh/vortex/Listener.java index 9502101..7255b9b 100644 --- a/src/main/java/com/jagrosh/vortex/Listener.java +++ b/src/main/java/com/jagrosh/vortex/Listener.java @@ -19,25 +19,26 @@ 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.member.update.GuildMemberUpdateNicknameEvent; +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 +57,7 @@ } @Override - public void onEvent(Event event) + public void onEvent(GenericEvent event) { if (event instanceof GuildMessageReceivedEvent) { @@ -116,9 +117,9 @@ // Perform automod on the newly-joined member vortex.getAutoMod().memberJoin(gevent); } - else if (event instanceof GuildMemberLeaveEvent) + else if (event instanceof GuildMemberRemoveEvent) { - GuildMemberLeaveEvent gmle = (GuildMemberLeaveEvent)event; + GuildMemberRemoveEvent gmle = (GuildMemberRemoveEvent)event; // Log the member leaving vortex.getBasicLogger().logGuildLeave(gmle); @@ -170,9 +171,9 @@ { vortex.getBasicLogger().logNameChange((UserUpdateDiscriminatorEvent)event); } - else if (event instanceof GuildMemberNickChangeEvent) + else if (event instanceof GuildMemberUpdateNicknameEvent) { - vortex.getAutoMod().dehoist(((GuildMemberNickChangeEvent) event).getMember()); + vortex.getAutoMod().dehoist(((GuildMemberUpdateNicknameEvent) event).getMember()); } else if (event instanceof UserUpdateAvatarEvent) { diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java index 75a5f6e..e31d2c9 100644 --- a/src/main/java/com/jagrosh/vortex/Vortex.java +++ b/src/main/java/com/jagrosh/vortex/Vortex.java @@ -15,6 +15,8 @@ */ package com.jagrosh.vortex; +import club.minnced.discord.webhook.WebhookClient; +import club.minnced.discord.webhook.WebhookClientBuilder; import com.jagrosh.vortex.commands.tools.LookupCmd; import com.jagrosh.vortex.commands.automod.*; import com.jagrosh.vortex.commands.general.*; @@ -31,29 +33,28 @@ 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 com.jagrosh.vortex.database.Database; import com.jagrosh.vortex.logging.BasicLogger; import com.jagrosh.vortex.logging.MessageCache; import com.jagrosh.vortex.logging.ModLogger; import com.jagrosh.vortex.logging.TextUploader; -import com.jagrosh.vortex.utils.BlockingSessionController; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.OtherUtil; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; -import java.util.EnumSet; +import java.util.Arrays; import java.util.concurrent.TimeUnit; -import net.dv8tion.jda.bot.sharding.DefaultShardManagerBuilder; -import net.dv8tion.jda.bot.sharding.ShardManager; -import net.dv8tion.jda.core.JDA; -import net.dv8tion.jda.core.JDABuilder; -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.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.entities.Activity; +import net.dv8tion.jda.api.entities.ChannelType; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.exceptions.PermissionException; +import net.dv8tion.jda.api.requests.restaction.MessageAction; +import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder; +import net.dv8tion.jda.api.sharding.ShardManager; +import net.dv8tion.jda.api.utils.cache.CacheFlag; /** * @@ -95,7 +96,7 @@ listener = new CommandExceptionListener(); CommandClient client = new CommandClientBuilder() .setPrefix(Constants.PREFIX) - .setGame(Game.playing(Constants.Wiki.PRIMARY_LINK)) + .setActivity(Activity.playing(Constants.Wiki.PRIMARY_LINK)) .setOwnerId(Constants.OWNER_ID) .setServerInvite(Constants.SERVER_INVITE) .setEmojis(Constants.SUCCESS, Constants.WARNING, Constants.ERROR) @@ -109,8 +110,8 @@ new AboutCmd(), new InviteCmd(), new PingCommand(), - new RoleinfoCmd(), - new ServerinfoCmd(), + new RoleinfoCommand(), + new ServerinfoCommand(), new UserinfoCmd(), // Moderation @@ -184,16 +185,15 @@ .setDiscordBotsKey(config.getString("listing.discord-bots")) //.setCarbonitexKey(config.getString("listing.carbon")) .build(); - shards = new DefaultShardManagerBuilder() + MessageAction.setDefaultMentions(Arrays.asList(Message.MentionType.EMOTE, Message.MentionType.CHANNEL)); + shards = DefaultShardManagerBuilder.createDefault(config.getString("bot-token"), Constants.INTENTS) .setShardsTotal(config.getInt("shards-total")) - .setToken(config.getString("bot-token")) .addEventListeners(new Listener(this), client, waiter) .setStatus(OnlineStatus.DO_NOT_DISTURB) - .setGame(Game.playing("loading...")) + .setActivity(Activity.playing("loading...")) .setBulkDeleteSplittingEnabled(false) .setRequestTimeoutRetry(true) - .setDisabledCacheFlags(EnumSet.of(CacheFlag.EMOTE, CacheFlag.GAME)) //TODO: dont disable GAME - .setSessionController(new BlockingSessionController()) + .disableCache(CacheFlag.EMOTE, CacheFlag.ACTIVITY) .build(); modlog.start(); diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java index 114c622..ec95853 100644 --- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java +++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java @@ -37,12 +37,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import net.dv8tion.jda.core.JDA; -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.JDA; +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; @@ -163,8 +163,8 @@ else if(ams.useAutoRaidMode()) { // find the time that we should be looking after, and count the number of people that joined after that - OffsetDateTime min = event.getMember().getJoinDate().minusSeconds(ams.raidmodeTime); - long recent = event.getGuild().getMemberCache().stream().filter(m -> !m.getUser().isBot() && m.getJoinDate().isAfter(min)).count(); + OffsetDateTime min = event.getMember().getTimeJoined().minusSeconds(ams.raidmodeTime); + long recent = event.getGuild().getMemberCache().stream().filter(m -> !m.getUser().isBot() && m.getTimeJoined().isAfter(min)).count(); if(recent>=ams.raidmodeNumber) { enableRaidMode(event.getGuild(), event.getGuild().getSelfMember(), now, "Maximum join rate exceeded ("+ams.raidmodeNumber+"/"+ams.raidmodeTime+"s)"); @@ -179,7 +179,7 @@ { try { - event.getGuild().getController().kick(event.getMember(), "Anti-Raid Mode").queue(); + event.getGuild().kick(event.getMember(), "Anti-Raid Mode").queue(); }catch(Exception ignore){} }); } @@ -189,8 +189,8 @@ { try { - event.getGuild().getController() - .addSingleRoleToMember(event.getMember(), vortex.getDatabase().settings.getSettings(event.getGuild()).getMutedRole(event.getGuild())) + event.getGuild() + .addRoleToMember(event.getMember(), vortex.getDatabase().settings.getSettings(event.getGuild()).getMutedRole(event.getGuild())) .reason(RESTORE_MUTE_ROLE_AUDIT).queue(); } catch(Exception ignore){} } @@ -204,11 +204,11 @@ private boolean shouldPerformAutomod(Member member, TextChannel channel) { // ignore users not in the guild - if(member==null || member.getGuild()==null) + if(member==null) return false; // ignore broken guilds - if(member.getGuild().getSelfMember()==null || member.getGuild().getOwner()==null) + if(member.getGuild().getOwner()==null) return false; // ignore bots @@ -273,11 +273,9 @@ return; // check the channel for channel-specific settings - boolean preventSpam = message.getTextChannel().getTopic()==null - || !message.getTextChannel().getTopic().toLowerCase().contains("{spam}"); - boolean preventInvites = (message.getTextChannel().getTopic()==null - || !message.getTextChannel().getTopic().toLowerCase().contains("{invites}")) - && settings.inviteStrikes > 0; + String topic = message.getTextChannel().getTopic(); + boolean preventSpam = topic==null || !topic.toLowerCase().contains("{spam}"); + boolean preventInvites = (topic==null || !topic.toLowerCase().contains("{invites}")) && settings.inviteStrikes > 0; List inviteWhitelist = !preventInvites ? Collections.emptyList() : vortex.getDatabase().inviteWhitelist.readWhitelist(message.getGuild()); @@ -307,7 +305,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; @@ -573,7 +571,7 @@ private static OffsetDateTime latestTime(Message m) { - return m.isEdited() ? m.getEditedTime() : m.getCreationTime(); + return m.isEdited() ? m.getTimeEdited(): 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 da011c6..4de347e 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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/jagrosh/vortex/automod/StrikeHandler.java b/src/main/java/com/jagrosh/vortex/automod/StrikeHandler.java index ac12a9b..8266044 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; /** * @@ -88,7 +88,7 @@ if(punishments.stream().anyMatch(p -> p.action==Action.BAN) && canBan) { OtherUtil.safeDM(target, dmmsg + punish(Action.BAN, moderator.getGuild()), isMember, - () -> moderator.getGuild().getController().ban(target, 7, notimeaudit).queue()); + () -> moderator.getGuild().ban(target, 7, notimeaudit).queue()); vortex.getDatabase().tempbans.clearBan(moderator.getGuild(), target.getIdLong()); return; } @@ -107,7 +107,7 @@ { int finalBanDuration = banDuration; OtherUtil.safeDM(target, dmmsg + punishTime(Action.TEMPBAN, moderator.getGuild(), banDuration), isMember, - () -> moderator.getGuild().getController().ban(target, 7, LogUtil.auditStrikeReasonFormat(moderator, finalBanDuration, counts[0], counts[1], reason)).queue()); + () -> moderator.getGuild().ban(target, 7, LogUtil.auditStrikeReasonFormat(moderator, finalBanDuration, counts[0], counts[1], reason)).queue()); vortex.getDatabase().tempbans.setBan(moderator.getGuild(), target.getIdLong(), now.plus(banDuration, ChronoUnit.MINUTES)); if(muteDuration>0) vortex.getDatabase().tempmutes.setMute(moderator.getGuild(), target.getIdLong(), muteTime(now, muteDuration)); @@ -116,8 +116,8 @@ if(punishments.stream().anyMatch(p -> p.action==Action.SOFTBAN) && canBan) { OtherUtil.safeDM(target, dmmsg + punish(Action.SOFTBAN, moderator.getGuild()), isMember, - () -> moderator.getGuild().getController().ban(target, 7, notimeaudit).queue( - s -> moderator.getGuild().getController().unban(target).reason(notimeaudit).queueAfter(4, TimeUnit.SECONDS))); + () -> moderator.getGuild().ban(target, 7, notimeaudit).queue( + s -> moderator.getGuild().unban(target).reason(notimeaudit).queueAfter(4, TimeUnit.SECONDS))); if(muteDuration>0) vortex.getDatabase().tempmutes.setMute(moderator.getGuild(), target.getIdLong(), muteTime(now, muteDuration)); return; @@ -128,7 +128,7 @@ if(moderator.getGuild().isMember(target)) { OtherUtil.safeDM(target, dmmsg + punish(Action.KICK, moderator.getGuild()), isMember, - () -> moderator.getGuild().getController().kick(target.getId(), notimeaudit).queue()); + () -> moderator.getGuild().kick(target.getId(), notimeaudit).queue()); } else { @@ -158,7 +158,7 @@ } else { - moderator.getGuild().getController().addSingleRoleToMember(mem, muted) + moderator.getGuild().addRoleToMember(mem, muted) .reason(muteDuration==Integer.MAX_VALUE ? notimeaudit : LogUtil.auditStrikeReasonFormat(moderator, muteDuration, counts[0], counts[1], reason)) .queue(); } diff --git a/src/main/java/com/jagrosh/vortex/commands/CommandExceptionListener.java b/src/main/java/com/jagrosh/vortex/commands/CommandExceptionListener.java index 661002d..df70ce0 100644 --- a/src/main/java/com/jagrosh/vortex/commands/CommandExceptionListener.java +++ b/src/main/java/com/jagrosh/vortex/commands/CommandExceptionListener.java @@ -20,7 +20,7 @@ import com.jagrosh.jdautilities.command.CommandListener; import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.Usage; -import net.dv8tion.jda.core.entities.ChannelType; +import net.dv8tion.jda.api.entities.ChannelType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 ca87617..a7c609f 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 462b4f1..ff72560 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.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/AntieveryoneCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/AntieveryoneCmd.java index 0430556..d69f155 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 be3065b..20b5c71 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 0f02b89..6493911 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 c241ccc..b039870 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.commands.CommandExceptionListener; import com.jagrosh.vortex.database.managers.PunishmentManager; 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/FilterCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java index 1e3ea3a..0c34066 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java @@ -23,9 +23,9 @@ import com.jagrosh.vortex.automod.Filter; import com.jagrosh.vortex.database.managers.PremiumManager; import com.jagrosh.vortex.utils.FormatUtil; -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 306bfb8..1612e49 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 a81fcf2..65c84f2 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; import com.jagrosh.vortex.utils.FormatUtil; 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 aec81e2..cde0f18 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/ResolvelinksCmd.java @@ -19,7 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; 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 0579796..e8352be 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/UnignoreCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/UnignoreCmd.java @@ -20,9 +20,9 @@ import com.jagrosh.jdautilities.commons.utils.FinderUtil; 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 0c8c5c5..fbaf84d 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java @@ -19,7 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.utils.FormatUtil; -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 index 349e2de..63366a1 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/RoleinfoCmd.java @@ -22,11 +22,11 @@ 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; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; /** * @@ -75,7 +75,7 @@ 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+"Creation: **"+role.getTimeCreated().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" 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 9033ed9..68b3898 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.Activity; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.User; /** * @@ -90,16 +89,16 @@ else roles=roles.substring(3)+"`"; str+="\n"+LINESTART+"Roles: "+roles; - str+="\n"+LINESTART+"Status: "+statusToEmote(member.getOnlineStatus(), member.getGame())+"**"+member.getOnlineStatus().name()+"**"; - Game game = member.getGame(); + str+="\n"+LINESTART+"Status: "+statusToEmote(member.getOnlineStatus(), member.getActivities())+"**"+member.getOnlineStatus().name()+"**"; + Activity game = member.getActivities().isEmpty() ? null : member.getActivities().get(0); if(game!=null) str+=" ("+formatGame(game)+")"; - str+="\n"+LINESTART+"Account Creation: **"+MiscUtil.getDateTimeString(MiscUtil.getCreationTime(user))+"**"; + str+="\n"+LINESTART+"Account Creation: **"+user.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**"; List joins = new ArrayList<>(event.getGuild().getMembers()); - Collections.sort(joins, (Member a, Member b) -> a.getJoinDate().compareTo(b.getJoinDate())); + Collections.sort(joins, (Member a, Member b) -> a.getTimeJoined().compareTo(b.getTimeJoined())); int index = joins.indexOf(member); - str+="\n"+LINESTART+"Guild Join Date: **"+member.getJoinDate().format(DateTimeFormatter.RFC_1123_DATE_TIME) + "** `(#"+(index+1)+")`"; + str+="\n"+LINESTART+"Guild Join Date: **"+member.getTimeJoined().format(DateTimeFormatter.RFC_1123_DATE_TIME) + "** `(#"+(index+1)+")`"; index-=3; if(index<0) index=0; @@ -128,9 +127,10 @@ .build()); } - private static String statusToEmote(OnlineStatus status, Game game) + private static String statusToEmote(OnlineStatus status, List games) { - if(game!=null && game.getType()==Game.GameType.STREAMING && game.getUrl()!=null && Game.isValidStreamingUrl(game.getUrl())) + Activity game = games.isEmpty() ? null : games.get(0); + if(game!=null && game.getType()==Activity.ActivityType.STREAMING && game.getUrl()!=null && Activity.isValidStreamingUrl(game.getUrl())) return "<:streaming:313956277132853248>"; switch(status) { case ONLINE: return "<:online:313956277808005120>"; @@ -142,7 +142,7 @@ } } - private static String formatGame(Game game) + private static String formatGame(Activity game) { String str; switch(game.getType()) 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 fecb38d..0048356 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; /** * @@ -104,7 +104,7 @@ long uid = ids.get(i); String id = Long.toString(uid); boolean last = i+1 == ids.size(); - event.getGuild().getController().ban(id, daysToDelete, reason).queue(success -> + event.getGuild().ban(id, daysToDelete, 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 dec0402..d3dd86c 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 @@ -55,7 +55,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 c0bc341..e728dea 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..db37434 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,13 @@ 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; /** * @@ -94,24 +93,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..c234bed 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; /** * @@ -51,7 +51,7 @@ + "\nLast Startup: "+FormatUtil.secondsToTime(Constants.STARTUP.until(OffsetDateTime.now(), ChronoUnit.SECONDS))+" ago" + "\nGuilds: **"+vortex.getShardManager().getGuildCache().size()+"**" + "\nMemory: **"+usedMb+"**Mb / **"+totalMb+"**Mb" - + "\nAverage Ping: **"+vortex.getShardManager().getAveragePing()+"**ms" + + "\nAverage Ping: **"+vortex.getShardManager().getAverageGatewayPing()+"**ms" + "\nShard Total: **"+vortex.getShardManager().getShardsTotal()+"**" + "\nShard Connectivity: ```diff"); vortex.getShardManager().getShards().forEach(jda -> sb.append("\n").append(jda.getStatus()==JDA.Status.CONNECTED ? "+ " : "- ") 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 6a946ca..365cf26 100644 --- a/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java @@ -22,7 +22,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 deleted file mode 100644 index e4466ee..0000000 --- a/src/main/java/com/jagrosh/vortex/commands/owner/TransferCmd.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2018 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.owner; - -import com.jagrosh.jdautilities.command.Command; -import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.vortex.Vortex; -import java.nio.file.Files; -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; - -/** - * - * @author John Grosh (jagrosh) - */ -public class TransferCmd extends Command -{ - private final Vortex vortex; - - public TransferCmd(Vortex vortex) - { - this.vortex = vortex; - this.name = "transfer"; - this.help = "transfers old settings"; - this.ownerCommand = true; - this.guildOnly = false; - this.hidden = true; - } - - @Override - protected void execute(CommandEvent event) - { - try - { - List list = Files.readAllLines(Paths.get("transfer.txt")); - HashMap oldSettings = new HashMap<>(); - list.stream().map(str -> str.split(" ")).forEach(split -> oldSettings.put(Long.parseLong(split[0]), split)); - int mcount = 0; - int count = 0; - for(Guild g: vortex.getShardManager().getGuilds()) - { - if(!oldSettings.containsKey(g.getIdLong())) - continue; - if(vortex.getDatabase().settings.hasSettings(g)) - continue; - if(vortex.getDatabase().automod.hasSettings(g)) - continue; - String[] split = oldSettings.get(g.getIdLong()); - int maxmentions = Integer.parseInt(split[4]); - TextChannel modlog = g.getTextChannelById(Long.parseLong(split[5])); - boolean autoraid = Boolean.parseBoolean(split[6]); - int spamLimit = Integer.parseInt(split[2]); - if("N".equalsIgnoreCase(split[3])) - spamLimit = 0; - int inviteStrikes = "N".equalsIgnoreCase(split[1]) ? 0 : 1; - if(modlog!=null) - { - vortex.getDatabase().settings.setModLogChannel(g, modlog); - mcount++; - } - if(maxmentions<7 && autoraid==false && spamLimit<=3 && inviteStrikes==0) - continue; - if(vortex.getDatabase().actions.useDefaultSettings(g)) - { - count++; - if(autoraid) - vortex.getDatabase().automod.setAutoRaidMode(g, 10, 10); - if(maxmentions>=7) - vortex.getDatabase().automod.setMaxMentions(g, maxmentions); - if(inviteStrikes>0) - vortex.getDatabase().automod.setInviteStrikes(g, inviteStrikes); - if(spamLimit>3) - vortex.getDatabase().automod.setDupeSettings(g, 1, 3, spamLimit); - } - } - event.replySuccess("Complete!\nLoaded: "+oldSettings.size()+"\nModlogs: "+mcount+"\nAutomod: "+count); - } - catch(Exception ex) - { - event.replyError("Error: "+ex+"\nat "+ex.getStackTrace()[0]); - - } - } -} 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 d647431..dfd61a1 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 7537cc4..5ea0a6a 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/PrefixCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/PrefixCmd.java @@ -19,7 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; 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 22c2558..1a1b472 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java @@ -20,9 +20,9 @@ import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.managers.PremiumManager.PremiumInfo; import com.jagrosh.vortex.utils.FormatUtil; -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 56a4b03..fa9f35b 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; /** * @@ -187,7 +187,7 @@ Role mutedRole; if(role==null) { - mutedRole = event.getGuild().getController().createRole().setName("Muted").setPermissions().setColor(1).complete(); + mutedRole = event.getGuild().createRole().setName("Muted").setPermissions().setColor(1).complete(); } else { @@ -197,7 +197,7 @@ sb.append(event.getClient().getSuccess()).append(" 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 e64f59a..0a14abc 100644 --- a/src/main/java/com/jagrosh/vortex/commands/settings/VoicelogCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/settings/VoicelogCmd.java @@ -19,7 +19,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/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 f023d8f..b42af66 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java @@ -23,16 +23,16 @@ 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.audit.AuditLogChange; -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.audit.AuditLogChange; +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; /** * @@ -66,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": @@ -169,7 +169,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/ExportCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/ExportCmd.java index 8a6eec5..979be27 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/ExportCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/ExportCmd.java @@ -19,8 +19,8 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.Vortex; import com.jagrosh.vortex.database.Database; -import net.dv8tion.jda.core.Permission; -import net.dv8tion.jda.core.entities.Guild; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Guild; import org.json.JSONObject; /** 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 9101172..2a1831f 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java @@ -24,8 +24,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; /** * @@ -76,7 +76,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 9b6bfc5..7ae19ac 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java @@ -22,16 +22,16 @@ import com.jagrosh.vortex.database.managers.PremiumManager; 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.entities.ChannelType; -import net.dv8tion.jda.core.entities.Invite; -import net.dv8tion.jda.core.entities.Message; -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.Message; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.exceptions.RateLimitedException; +import net.dv8tion.jda.api.utils.TimeUtil; +import net.dv8tion.jda.api.utils.WidgetUtil; +import net.dv8tion.jda.api.utils.WidgetUtil.Widget; /** * @@ -127,7 +127,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: **" + TimeUtil.getDateTimeString(u.getTimeCreated()) + "**"; eb.setDescription(str); event.reply(new MessageBuilder().append(FormatUtil.filterEveryone(text)).setEmbed(eb.build()).build()); return true; @@ -147,13 +147,17 @@ return; } catch(Exception ignore) {} - if(widget != null && widget.isAvailable() && widget.getInviteCode() != null) + if(widget != null && widget.isAvailable()) { - try + String invCode = widget.getInviteCode(); + if(invCode != null) { - invite = Invite.resolve(event.getJDA(), widget.getInviteCode(), true).complete(false); + try + { + invite = Invite.resolve(event.getJDA(), invCode, true).complete(false); + } + catch(Exception ignore) {} } - catch(Exception ignore) {} } event.reply(constructMessage(invite, widget)); } @@ -174,11 +178,15 @@ catch(Exception ignore) {} if(invite != null) { - try + Invite.Guild g = invite.getGuild(); + if(g != null) { - widget = WidgetUtil.getWidget(invite.getGuild().getIdLong()); + try + { + widget = WidgetUtil.getWidget(g.getIdLong()); + } + catch(Exception ignore) {} } - catch(Exception ignore) {} } event.reply(constructMessage(invite, widget)); } @@ -200,25 +208,36 @@ } else { - gid = invite.getGuild().getIdLong(); - gname = invite.getGuild().getName(); - users = invite.getGuild().getOnlineCount(); + Invite.Guild g = invite.getGuild(); + if(g == null) + { + gid = 0L; + gname = "Unknown Guild"; + users = 0; + } + else + { + gid = g.getIdLong(); + gname = g.getName(); + users = g.getOnlineCount(); + } } String text = GUILD_EMOJI + " Information about **" + gname + "**:"; EmbedBuilder eb = new EmbedBuilder(); eb.appendDescription(LINESTART + "ID: **" + gid + "**" - + "\n" + LINESTART + "Creation: **" + MiscUtil.getCreationTime(gid).format(DateTimeFormatter.RFC_1123_DATE_TIME) + "**" + + "\n" + LINESTART + "Creation: **" + TimeUtil.getTimeCreated(gid).format(DateTimeFormatter.RFC_1123_DATE_TIME) + "**" + "\n" + LINESTART + "Users: " + (users == -1 ? "N/A" : "**" + users + "** online") + (widget != null && widget.isAvailable() ? "\n" + LINESTART + "Channels: **" + widget.getVoiceChannels().size() + "** voice" : "")); if(invite != null) { - eb.setThumbnail(invite.getGuild().getIconUrl()); - eb.setImage(invite.getGuild().getSplashId() == null ? null : invite.getGuild().getSplashUrl() + "?size=1024"); + Invite.Guild g = invite.getGuild(); + eb.setThumbnail(g.getIconUrl()); + eb.setImage(g.getSplashId() == null ? null : g.getSplashUrl() + "?size=1024"); eb.addField("Invite Info", LINESTART + "Invite: **" + invite.getCode() + "**" + "\n" + LINESTART + "Channel: **" + (invite.getChannel().getType() == ChannelType.TEXT ? "#" : "") + invite.getChannel().getName() + "** (ID:" +invite.getChannel().getId() + ")" + "\n" + LINESTART + "Inviter: " + (invite.getInviter() == null ? "N/A" : FormatUtil.formatFullUser(invite.getInviter())) - + (invite.getGuild().getSplashId() == null ? "" : "\n" + LINESTART + "Splash: "), false); + + (g.getSplashId() == null ? "" : "\n" + LINESTART + "Splash: "), false); } return new MessageBuilder().append(FormatUtil.filterEveryone(text)).setEmbed(eb.build()).build(); } 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 9228151..38feb57 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java @@ -24,8 +24,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; import org.json.JSONObject; /** 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 291abe0..d91ae0f 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java @@ -25,9 +25,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 org.json.JSONArray; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.MessageEmbed.Field; import org.json.JSONObject; /** 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 b6a46eb..b58e5ad 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java @@ -29,12 +29,11 @@ import java.time.zone.ZoneRulesException; import java.util.Collection; import java.util.Collections; -import java.util.List; -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; import org.json.JSONObject; /** 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 8f0c80c..0037d96 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Set; 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.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; import org.json.JSONArray; /** 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 165730e..bcc8928 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java @@ -6,7 +6,7 @@ import com.jagrosh.easysql.columns.LongColumn; import com.jagrosh.vortex.Constants; 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 cf7f780..56cfd41 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import net.dv8tion.jda.core.entities.Guild; +import net.dv8tion.jda.api.entities.Guild; import org.json.JSONObject; /** 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 79946f5..dd6bbed 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; import org.json.JSONObject; /** 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 9dee2c3..a14ac9d 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/StrikeManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/StrikeManager.java @@ -21,9 +21,8 @@ import com.jagrosh.easysql.columns.*; import java.util.HashMap; import java.util.Map; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import org.json.JSONArray; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; import org.json.JSONObject; /** 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 5d7afd2..d0ad637 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/TempBanManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/TempBanManager.java @@ -25,9 +25,9 @@ import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; -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; import org.json.JSONObject; /** @@ -119,7 +119,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 3285167..73d527c 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/TempMuteManager.java @@ -25,11 +25,11 @@ import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; -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; import org.json.JSONObject; /** @@ -158,7 +158,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 6b28b47..70f63d2 100644 --- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java @@ -27,19 +27,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.GuildMemberRemoveEvent; +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; /** * @@ -94,9 +94,8 @@ try { usage.increment(tc.getGuild().getIdLong()); - tc.sendFile(file, filename, new MessageBuilder() - .append(FormatUtil.filterEveryone(LogUtil.basiclogFormat(now, vortex.getDatabase().settings.getSettings(tc.getGuild()).getTimezone(), emote, message))) - .build()).queue(); + tc.sendMessage(FormatUtil.filterEveryone(LogUtil.basiclogFormat(now, vortex.getDatabase().settings.getSettings(tc.getGuild()).getTimezone(), emote, message))) + .addFile(file, filename).queue(); } catch(PermissionException ignore) {} } @@ -125,7 +124,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()); } @@ -239,19 +238,19 @@ 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) + public void logGuildLeave(GuildMemberRemoveEvent event) { TextChannel tc = vortex.getDatabase().settings.getSettings(event.getGuild()).getServerLogChannel(event.getGuild()); 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(); @@ -263,7 +262,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 ab87e79..12dd3e6 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 1e04e43..781ac5a 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; @@ -223,7 +223,7 @@ Role mRole = gs.getMutedRole(guild); try { - List list = guild.getAuditLogs().cache(false).limit(limit).submit().get(30, TimeUnit.SECONDS); + List list = guild.retrieveAuditLogs().cache(false).limit(limit).submit().get(30, TimeUnit.SECONDS); for(AuditLogEntry ale: vortex.getDatabase().auditcache.filterUncheckedEntries(list)) { Action act = null; @@ -294,7 +294,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 @@ -310,8 +310,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 79a9c3d..24332de 100644 --- a/src/main/java/com/jagrosh/vortex/logging/TextUploader.java +++ b/src/main/java/com/jagrosh/vortex/logging/TextUploader.java @@ -15,13 +15,12 @@ */ package com.jagrosh.vortex.logging; -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.JDA; +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 787346d..242a19e 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/ConditionalEventManager.java b/src/main/java/com/jagrosh/vortex/utils/ConditionalEventManager.java new file mode 100644 index 0000000..b358587 --- /dev/null +++ b/src/main/java/com/jagrosh/vortex/utils/ConditionalEventManager.java @@ -0,0 +1,41 @@ +/* + * Copyright 2020 John Grosh (john.a.grosh@gmail.com). + * + * 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.utils; + +import net.dv8tion.jda.api.events.GenericEvent; +import net.dv8tion.jda.api.events.guild.GenericGuildEvent; +import net.dv8tion.jda.api.hooks.InterfacedEventManager; + +/** + * + * @author John Grosh (john.a.grosh@gmail.com) + */ +public class ConditionalEventManager extends InterfacedEventManager +{ + @Override + public void handle(GenericEvent ge) + { + // check if this guild is already loaded by some other shard + if(ge instanceof GenericGuildEvent) + { + long gid = ((GenericGuildEvent) ge).getGuild().getIdLong(); + + } + + // otherwise, continue as normal + super.handle(ge); + } +} diff --git a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java index be96748..3d2ffcf 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/MultiBotShardManager.java b/src/main/java/com/jagrosh/vortex/utils/MultiBotShardManager.java new file mode 100644 index 0000000..0f213e3 --- /dev/null +++ b/src/main/java/com/jagrosh/vortex/utils/MultiBotShardManager.java @@ -0,0 +1,25 @@ +/* + * Copyright 2020 John Grosh (john.a.grosh@gmail.com). + * + * 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.utils; + +/** + * + * @author John Grosh (john.a.grosh@gmail.com) + */ +public class MultiBotShardManager +{ + +} 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; }