greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #63 from BigBotNetwork/greg-dev

Browse source 
Perms Check
This commit is contained in:
Skidder 2019-11-16 19:58:03 +01:00 • committed by GitHub
commit eb4930be22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
View file

@ -4,6 +4,7 @@ import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -13,47 +14,51 @@ public class HelpCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent event) { public void executed(String[] args, CommandEvent event) {
if (args.length == 0) { if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) {
HashMap<String, ArrayList<Command>> hashMap = new HashMap<>(); if (args.length == 0) {
for (Command cmd : event.getCommandHandler().getCommandList()) { HashMap<String, ArrayList<Command>> hashMap = new HashMap<>();
if (!hashMap.containsKey(cmd.getClass().getPackageName())) { for (Command cmd : event.getCommandHandler().getCommandList()) {
ArrayList<Command> cmdlist = new ArrayList<>(); if (!hashMap.containsKey(cmd.getClass().getPackageName())) {
cmdlist.add(cmd); ArrayList<Command> cmdlist = new ArrayList<>();
hashMap.put(cmd.getClass().getPackageName(), cmdlist); cmdlist.add(cmd);
} else { hashMap.put(cmd.getClass().getPackageName(), cmdlist);
hashMap.get(cmd.getClass().getPackageName()).add(cmd); } else {
} hashMap.get(cmd.getClass().getPackageName()).add(cmd);
}
EmbedBuilder eb = new EmbedBuilder();
for (Map.Entry<String, ArrayList<Command>> 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);
} }
} EmbedBuilder eb = new EmbedBuilder();
new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); for (Map.Entry<String, ArrayList<Command>> entry : hashMap.entrySet()) {
event.getChannel().sendMessage(eb.build()).queue(); if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
} else { StringBuilder sb = new StringBuilder();
for (Command cmd : event.getCommandHandler().getCommandList()) { for (int i = 0; i < entry.getValue().size(); i++) {
for (String label : cmd.labels()) { Command cmd = entry.getValue().get(i);
if (label.toLowerCase().equals(args[0])) { sb.append("`" + cmd.labels()[0] + "`");
if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { if (i < entry.getValue().size() - 1) sb.append(", ");
EmbedBuilder eb = new EmbedBuilder(); }
String name = cmd.labels()[0]; String[] packagesplit = entry.getKey().split("\\.");
eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); eb.addField(packagesplit[packagesplit.length - 1], sb.toString(), false);
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(); 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();
} }
} }