diff --git a/lists/referral_domains.txt b/lists/referral_domains.txt index 1f5a4c5..091205d 100644 --- a/lists/referral_domains.txt +++ b/lists/referral_domains.txt @@ -52,6 +52,7 @@ free-gg.com rbxfree.com fortnitevb.com +fortnite-gifts.com fortnite-special.com fortnite-vbucks.net fortnite-vbucks.de diff --git a/pom.xml b/pom.xml index e1aacdf..559fc7e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ net.dv8tion JDA - 3.6.0_365 + 3.6.0_367 com.jagrosh 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 f9ae9a7..20514da 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java @@ -26,6 +26,7 @@ import com.jagrosh.vortex.utils.LogUtil; import java.time.Instant; import java.time.temporal.ChronoUnit; +import net.dv8tion.jda.core.entities.Role; /** * @@ -63,6 +64,7 @@ else minutes = 1; String reason = LogUtil.auditReasonFormat(event.getMember(), minutes, args.reason); + Role modrole = vortex.getDatabase().settings.getSettings(event.getGuild()).getModeratorRole(event.getGuild()); StringBuilder builder = new StringBuilder(); args.members.forEach(m -> @@ -71,6 +73,8 @@ builder.append("\n").append(event.getClient().getError()).append(" You do not have permission to ban ").append(FormatUtil.formatUser(m.getUser())); else if(!event.getSelfMember().canInteract(m)) builder.append("\n").append(event.getClient().getError()).append(" I am unable to ban ").append(FormatUtil.formatUser(m.getUser())); + else if(modrole!=null && m.getRoles().contains(modrole)) + builder.append("\n").append(event.getClient().getError()).append(" I won't ban ").append(FormatUtil.formatUser(m.getUser())).append(" because they have the Moderator Role"); else args.ids.add(m.getUser().getIdLong()); }); 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 5a958f1..96819fd 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/KickCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/KickCmd.java @@ -25,6 +25,7 @@ import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; import java.util.List; +import net.dv8tion.jda.core.entities.Role; /** * @@ -52,6 +53,7 @@ return; } String reason = LogUtil.auditReasonFormat(event.getMember(), args.reason); + Role modrole = vortex.getDatabase().settings.getSettings(event.getGuild()).getModeratorRole(event.getGuild()); StringBuilder builder = new StringBuilder(); List toKick = new LinkedList<>(); @@ -61,6 +63,8 @@ builder.append("\n").append(event.getClient().getError()).append(" You do not have permission to kick ").append(FormatUtil.formatUser(m.getUser())); else if(!event.getSelfMember().canInteract(m)) builder.append("\n").append(event.getClient().getError()).append(" I am unable to kick ").append(FormatUtil.formatUser(m.getUser())); + else if(modrole!=null && m.getRoles().contains(modrole)) + builder.append("\n").append(event.getClient().getError()).append(" I won't kick ").append(FormatUtil.formatUser(m.getUser())).append(" because they have the Moderator Role"); else toKick.add(m); }); 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 838d0ae..0962a5b 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/MuteCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/MuteCmd.java @@ -82,6 +82,7 @@ else minutes = 1; String reason = LogUtil.auditReasonFormat(event.getMember(), minutes, args.reason); + Role modrole = vortex.getDatabase().settings.getSettings(event.getGuild()).getModeratorRole(event.getGuild()); StringBuilder builder = new StringBuilder(); List toMute = new LinkedList<>(); @@ -93,6 +94,8 @@ builder.append("\n").append(event.getClient().getError()).append(" I am unable to mute ").append(FormatUtil.formatUser(m.getUser())); else if(m.getRoles().contains(muteRole)) builder.append("\n").append(event.getClient().getError()).append(" ").append(FormatUtil.formatUser(m.getUser())).append(" is already muted!"); + else if(modrole!=null && m.getRoles().contains(modrole)) + builder.append("\n").append(event.getClient().getError()).append(" I won't mute ").append(FormatUtil.formatUser(m.getUser())).append(" because they have the Moderator Role"); else toMute.add(m); }); 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 33eb0dc..851a5be 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/SoftbanCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/SoftbanCmd.java @@ -26,6 +26,7 @@ import com.jagrosh.vortex.utils.FormatUtil; import com.jagrosh.vortex.utils.LogUtil; import java.util.List; +import net.dv8tion.jda.core.entities.Role; /** * @@ -53,6 +54,7 @@ return; } String reason = LogUtil.auditReasonFormat(event.getMember(), args.reason); + Role modrole = vortex.getDatabase().settings.getSettings(event.getGuild()).getModeratorRole(event.getGuild()); String unbanreason = LogUtil.auditReasonFormat(event.getMember(), "Softban Unban"); StringBuilder builder = new StringBuilder(); List toSoftban = new LinkedList<>(); @@ -63,6 +65,8 @@ builder.append("\n").append(event.getClient().getError()).append(" You do not have permission to softban ").append(FormatUtil.formatUser(m.getUser())); else if(!event.getSelfMember().canInteract(m)) builder.append("\n").append(event.getClient().getError()).append(" I am unable to softban ").append(FormatUtil.formatUser(m.getUser())); + else if(modrole!=null && m.getRoles().contains(modrole)) + builder.append("\n").append(event.getClient().getError()).append(" I won't softban ").append(FormatUtil.formatUser(m.getUser())).append(" because they have the Moderator Role"); else toSoftban.add(m); }); 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 46a9f57..e89d52b 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java @@ -24,6 +24,7 @@ import java.util.LinkedList; import java.util.List; import net.dv8tion.jda.core.Permission; +import net.dv8tion.jda.core.entities.Role; import net.dv8tion.jda.core.entities.User; /** @@ -74,6 +75,7 @@ return; } StringBuilder builder = new StringBuilder(); + Role modrole = vortex.getDatabase().settings.getSettings(event.getGuild()).getModeratorRole(event.getGuild()); args.members.forEach(m -> { @@ -81,6 +83,8 @@ builder.append("\n").append(event.getClient().getError()).append(" You do not have permission to interact with ").append(FormatUtil.formatUser(m.getUser())); else if(!event.getSelfMember().canInteract(m)) builder.append("\n").append(event.getClient().getError()).append(" I am unable to interact with ").append(FormatUtil.formatUser(m.getUser())); + else if(modrole!=null && m.getRoles().contains(modrole)) + builder.append("\n").append(event.getClient().getError()).append(" I won't strike ").append(FormatUtil.formatUser(m.getUser())).append(" because they have the Moderator Role"); else args.users.add(m.getUser()); }); 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 1c31ad3..819ca14 100644 --- a/src/main/java/com/jagrosh/vortex/commands/moderation/VoicekickCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/moderation/VoicekickCmd.java @@ -26,6 +26,7 @@ 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; /** @@ -57,6 +58,7 @@ return; } String reason = LogUtil.auditReasonFormat(event.getMember(), args.reason); + Role modrole = vortex.getDatabase().settings.getSettings(event.getGuild()).getModeratorRole(event.getGuild()); StringBuilder builder = new StringBuilder(); List toKick = new LinkedList<>(); @@ -68,6 +70,8 @@ builder.append("\n").append(event.getClient().getError()).append(" I am unable to voicekick ").append(FormatUtil.formatUser(m.getUser())); else if(!m.getVoiceState().inVoiceChannel()) builder.append("\n").append(event.getClient().getWarning()).append(" ").append(FormatUtil.formatUser(m.getUser())).append(" is not in a voice channel!"); + else if(modrole!=null && m.getRoles().contains(modrole)) + builder.append("\n").append(event.getClient().getError()).append(" I won't voicekick ").append(FormatUtil.formatUser(m.getUser())).append(" because they have the Moderator Role"); else toKick.add(m); });