From ad6a6487c95c7ec6e7957e2e654da58e76af56a5 Mon Sep 17 00:00:00 2001 From: Hax Date: Wed, 18 Dec 2019 18:55:26 +0100 Subject: [PATCH] d --- .../commands/owner/GuildLeaveCommand.java | 30 +++++++++---------- .../hadder/commands/owner/RebootCommand.java | 10 +++---- .../commands/owner/ShutdownCommand.java | 15 +++++----- .../com/bbn/hadder/core/CommandHandler.java | 2 +- 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 8b2a21e..0a2c7a5 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -6,36 +6,34 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.commands.Perm; +import com.bbn.hadder.commands.Perms; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.Guild; +@Perms(Perm.BOT_OWNER) public class GuildLeaveCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { - if (args.length > 0) { - Guild guild = event.getJDA().getGuildById(args[0]); - guild.leave().queue(); - event.getTextChannel() - .sendMessage(event.getMessageEditor() - .getMessage(MessageEditor.MessageType.INFO, "commands.owner.guildleave.success.title", - "", "commands.owner.guildleave.success.description", guild.getName()) - .build()) - .queue(); - } else { - event.getHelpCommand().sendHelp(this, event); - } - } else { + if (args.length > 0) { + Guild guild = event.getJDA().getGuildById(args[0]); + guild.leave().queue(); event.getTextChannel() - .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()) + .sendMessage(event.getMessageEditor() + .getMessage(MessageEditor.MessageType.INFO, "commands.owner.guildleave.success.title", + "", "commands.owner.guildleave.success.description", guild.getName()) + .build()) .queue(); + } else { + event.getHelpCommand().sendHelp(this, event); } + } @Override public String[] labels() { - return new String[] { "guildleave" }; + return new String[]{"guildleave"}; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index 4ce2138..5059e4f 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -6,18 +6,16 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.commands.Perm; +import com.bbn.hadder.commands.Perms; import com.bbn.hadder.utils.MessageEditor; - +@Perms(Perm.BOT_OWNER) public class RebootCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { - Runtime.getRuntime().exit(69); - } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); - } + Runtime.getRuntime().exit(69); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index 4f9307a..56bac44 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -6,20 +6,19 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.commands.Perm; +import com.bbn.hadder.commands.Perms; import com.bbn.hadder.utils.MessageEditor; +@Perms(Perm.BOT_OWNER) public class ShutdownCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue(); - event.getJDA().getShardManager().shutdown(); - System.out.println("Bot shut down via Command..."); - Runtime.getRuntime().exit(69); - } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); - } + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue(); + event.getJDA().getShardManager().shutdown(); + System.out.println("Bot shut down via Command..."); + Runtime.getRuntime().exit(69); } @Override diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 494592a..0949f5d 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -38,7 +38,7 @@ public class CommandHandler { CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink, config, this, helpCommand, new MessageEditor(rethink, event.getAuthor())); - if (Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) { + if (!Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) { for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) { if (!perm.check(commandEvent)) { commandEvent.getTextChannel()