From e811da3aeb5f96bc036a1c318c8e5f5d5e14d129 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 10 Mar 2020 17:19:00 +0100 Subject: [PATCH 1/5] No permission improvement --- .../bbn/hadder/listener/CommandListener.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index aeb8615..286d320 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -25,6 +25,7 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.dv8tion.jda.api.hooks.ListenerAdapter; import java.awt.*; @@ -64,13 +65,17 @@ public class CommandListener extends ListenerAdapter { } } } else { - e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() - .setTitle("No permission") - .setDescription("I need the `MESSAGE EMBED LINKS` permission in order to work!") - .setColor(Color.RED) - .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") - .setTimestamp(Instant.now()) - .build()).queue(); + try { + e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() + .setTitle("No permission") + .setDescription("I need the `MESSAGE EMBED LINKS` permission in order to work!") + .setColor(Color.RED) + .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") + .setTimestamp(Instant.now()) + .build()).queue(); + } catch (ErrorResponseException ex) { + e.getTextChannel().sendMessage("I need the `MESSAGE EMBED LINKS` permission in order to work!").queue(); + } } } else { e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() From 55977585ac04bee3155662b1e11918b2e470942d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 13:18:39 +0000 Subject: [PATCH 2/5] Bump maven-site-plugin from 3.8.2 to 3.9.0 Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.8.2 to 3.9.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.8.2...maven-site-plugin-3.9.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c77db22..7137793 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ maven-site-plugin - 3.8.2 + 3.9.0 maven-project-info-reports-plugin From 71bfe01285714012885ec6850f3c2d1980c1da04 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 13:17:35 +0000 Subject: [PATCH 3/5] Bump JDA from 4.1.1_110 to 4.1.1_111 Bumps JDA from 4.1.1_110 to 4.1.1_111. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7137793..5cb7ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_110 + 4.1.1_111 org.json From ba9672f87da3966f0ecaa3179ff8d37600dcce50 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 13:17:03 +0000 Subject: [PATCH 4/5] Bump JDA from 4.1.1_111 to 4.1.1_113 Bumps JDA from 4.1.1_111 to 4.1.1_113. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cb7ed4..8fc48d9 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_111 + 4.1.1_113 org.json From 35f932c3773c95fcd70117fb77362a4c184d347e Mon Sep 17 00:00:00 2001 From: Schlauer-Hax Date: Fri, 13 Mar 2020 21:44:01 +0100 Subject: [PATCH 5/5] moveall command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/misc/MoveAllCommand.java | 50 +++++++++++++++++++ src/main/java/com/bbn/hadder/core/Perm.java | 22 +++++--- 3 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 57a7cb0..0d93dd7 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -126,7 +126,8 @@ public class Hadder { new EchoCommand(), new ServerStatsCommand(), new ProfileCommand(), - new CodeCommand()), config, helpCommand); + new CodeCommand(), + new MoveAllCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java new file mode 100644 index 0000000..5d26277 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -0,0 +1,50 @@ +/* + * @author Hax / Hax6775 / Schlauer_Hax + */ + +package com.bbn.hadder.commands.misc; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.core.Perm; +import com.bbn.hadder.core.Perms; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; + +import java.util.ArrayList; +import java.util.Objects; + +public class MoveAllCommand implements Command { + + @Perms(Perm.VOICE_MOVE_OTHERS) + @Override + public void executed(String[] args, CommandEvent e) { + if (args.length == 2) { + Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().forEach( + member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() + ); + } else { + e.getHelpCommand().sendHelp(this, e); + } + } + + @Override + public String[] labels() { + return new String[]{"moveall", "move-all"}; + } + + @Override + public String description() { + return "Moves All users in channel1 to channel2"; + } + + @Override + public String usage() { + return "[channel1] [channel2]"; + } + + @Override + public String example() { + return "452806287307046923 452858405212782623"; + } +} diff --git a/src/main/java/com/bbn/hadder/core/Perm.java b/src/main/java/com/bbn/hadder/core/Perm.java index 0eea910..2c5b4bb 100644 --- a/src/main/java/com/bbn/hadder/core/Perm.java +++ b/src/main/java/com/bbn/hadder/core/Perm.java @@ -26,54 +26,60 @@ public enum Perm { public boolean check(CommandEvent e) { return e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, MANAGE_MESSAGES { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.MESSAGE_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, BAN_MEMBERS { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.BAN_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, KICK_MEMBERS { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.KICK_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, MANAGE_SERVER { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.MANAGE_SERVER) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, MANAGE_ROLES { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.MANAGE_ROLES) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, MANAGE_NICKNAMES { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.NICKNAME_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, ADMINISTRATOR { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.ADMINISTRATOR) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } - }, + }, MANAGE_WEBHOOKS { @Override public boolean check(CommandEvent e) { return e.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } + }, + VOICE_MOVE_OTHERS { + @Override + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.VOICE_MOVE_OTHERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); + } }; public abstract boolean check(CommandEvent e);