From 101a31f3388436f89fdd0966b4742574045bafbd Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 10 Nov 2019 20:48:18 +0100 Subject: [PATCH 1/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd779c4..4f62557 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # Hadder [![Build Status](https://travis-ci.com/BigBotNetwork/Hadder.svg?branch=master)](https://travis-ci.com/BigBotNetwork/Hadder) + -- 2.45.3 From 5e67ef48db8a51d57b82bc3dbfcde460eff600fd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2019 13:22:38 +0000 Subject: [PATCH 2/6] Bump JDA from 4.0.0_56 to 4.0.0_59 Bumps JDA from 4.0.0_56 to 4.0.0_59. 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 23bcffe..688c7c3 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_56 + 4.0.0_59 org.json -- 2.45.3 From 0b67064e34c36db1bb874e2535be806743abeb61 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 13:44:49 +0000 Subject: [PATCH 3/6] Bump JDA from 4.0.0_59 to 4.0.0_60 Bumps JDA from 4.0.0_59 to 4.0.0_60. 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 688c7c3..d602e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_59 + 4.0.0_60 org.json -- 2.45.3 From 5183cac5cc9761b4153092c7b502a68231344372 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2019 13:41:50 +0000 Subject: [PATCH 4/6] Bump JDA from 4.0.0_60 to 4.0.0_61 Bumps JDA from 4.0.0_60 to 4.0.0_61. 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 d602e9c..3211132 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ net.dv8tion JDA - 4.0.0_60 + 4.0.0_61 org.json -- 2.45.3 From 9e09944fff6c2e61334821328b641648f4e85082 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 16:30:13 +0100 Subject: [PATCH 5/6] Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3211132..7afe0e1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ Hadder Hadder - 0.7-ALPHA + 0.7.1-ALPHA Hadder -- 2.45.3 From d9d6dfe195b7c211b8e2860e22eefe77c6188826 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 16 Nov 2019 19:57:11 +0100 Subject: [PATCH 6/6] Perms Check --- .../hadder/commands/general/HelpCommand.java | 75 ++++++++++--------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index bcc800d..62595db 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -4,6 +4,7 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; import java.util.ArrayList; import java.util.HashMap; @@ -13,47 +14,51 @@ public class HelpCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (args.length == 0) { - HashMap> hashMap = new HashMap<>(); - for (Command cmd : event.getCommandHandler().getCommandList()) { - if (!hashMap.containsKey(cmd.getClass().getPackageName())) { - ArrayList cmdlist = new ArrayList<>(); - cmdlist.add(cmd); - hashMap.put(cmd.getClass().getPackageName(), cmdlist); - } else { - hashMap.get(cmd.getClass().getPackageName()).add(cmd); - } - } - EmbedBuilder eb = new EmbedBuilder(); - for (Map.Entry> entry : hashMap.entrySet()) { - if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < entry.getValue().size(); i++) { - Command cmd = entry.getValue().get(i); - sb.append("`" + cmd.labels()[0] + "`"); - if (i < entry.getValue().size() - 1) sb.append(", "); + if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { + if (args.length == 0) { + HashMap> hashMap = new HashMap<>(); + for (Command cmd : event.getCommandHandler().getCommandList()) { + if (!hashMap.containsKey(cmd.getClass().getPackageName())) { + ArrayList cmdlist = new ArrayList<>(); + cmdlist.add(cmd); + hashMap.put(cmd.getClass().getPackageName(), cmdlist); + } else { + hashMap.get(cmd.getClass().getPackageName()).add(cmd); } - String[] packagesplit = entry.getKey().split("\\."); - eb.addField(packagesplit[packagesplit.length - 1], sb.toString(), false); } - } - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); - event.getChannel().sendMessage(eb.build()).queue(); - } else { - for (Command cmd : event.getCommandHandler().getCommandList()) { - for (String label : cmd.labels()) { - if (label.toLowerCase().equals(args[0])) { - if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { - EmbedBuilder eb = new EmbedBuilder(); - String name = cmd.labels()[0]; - eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); - eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); - event.getChannel().sendMessage(eb.build()).queue(); + EmbedBuilder eb = new EmbedBuilder(); + for (Map.Entry> entry : hashMap.entrySet()) { + if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < entry.getValue().size(); i++) { + Command cmd = entry.getValue().get(i); + sb.append("`" + cmd.labels()[0] + "`"); + if (i < entry.getValue().size() - 1) sb.append(", "); + } + String[] packagesplit = entry.getKey().split("\\."); + eb.addField(packagesplit[packagesplit.length - 1], sb.toString(), false); + } + } + new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); + event.getChannel().sendMessage(eb.build()).queue(); + } else { + for (Command cmd : event.getCommandHandler().getCommandList()) { + for (String label : cmd.labels()) { + if (label.toLowerCase().equals(args[0])) { + if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { + EmbedBuilder eb = new EmbedBuilder(); + String name = cmd.labels()[0]; + eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); + eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); + new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); + event.getChannel().sendMessage(eb.build()).queue(); + } } } } } + } else { + event.getTextChannel().sendMessage("I need the Embed Links Permission to send the Help Menu!").queue(); } } -- 2.45.3