Changed certain command permissions

C-Hess · C-Hess · commit fdafa7c384b7 · 2017-09-09T16:45:24.000-05:00
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/ClearCommand.java b/src/main/java/com/github/bustedearlobes/themis/commands/ClearCommand.java
@@ -17,7 +17,7 @@ public class ClearCommand extends Command {
     private static final int DEFAULT_CLEAR_NUMBER = 100;
     
     public ClearCommand() {
-        super("clear", REGEX);
+        super("clear", REGEX, true);
     }
 
     @Override
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/Command.java b/src/main/java/com/github/bustedearlobes/themis/commands/Command.java
@@ -12,9 +12,11 @@
 public abstract class Command {
     private Pattern pattern;
     private String commandName;
+    private boolean requiresOwner;
     
-    public Command(String commandName, String regexValidation) {
+    public Command(String commandName, String regexValidation, boolean requiresOwner) {
         pattern = Pattern.compile(regexValidation);
+        this.requiresOwner = requiresOwner;
         this.commandName = commandName;
     }
     
@@ -69,6 +71,10 @@ public void printUsage(TextChannel textChannel) {
         textChannel.sendMessage("Usage:\n\n" + getFullCommandManual().toString()).complete();
     }
     
+    public boolean requiresOwner() {
+        return requiresOwner;
+    }
+    
     protected abstract void onCall(Matcher fullCommand, Message message, JDA jda, Themis themis);
 
 }
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/CommandListener.java b/src/main/java/com/github/bustedearlobes/themis/commands/CommandListener.java
@@ -31,13 +31,28 @@ public List<Command> getCommands() {
     
     @Override
     public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
-        if(event.getMember().isOwner()) {
-            String messageContent = event.getMessage().getContent();
-            if(messageContent.trim().startsWith(COMMAND_BASE)) {
-                messageContent = messageContent.trim().replaceFirst(COMMAND_BASE, "");
-                String commandName = messageContent.trim().split(" ")[0];
-                for(Command command: commands) {
-                    if(commandName.equals(command.getCommandName())) {
+        String messageContent = event.getMessage().getContent();
+        if(messageContent.trim().startsWith(COMMAND_BASE)) {
+            messageContent = messageContent.trim().replaceFirst(COMMAND_BASE, "");
+            String commandName = messageContent.trim().split(" ")[0];
+            for(Command command: commands) {
+                if(commandName.equals(command.getCommandName())) {
+                    if(command.requiresOwner() && event.getMember().isOwner()) {
+                        if(command.validateCall(messageContent)) {
+                            try {
+                                command.onCall(command.parseCommand(messageContent),
+                                        event.getMessage(),
+                                        event.getJDA(),
+                                        themis);
+                            } catch(Exception e) {
+                                LOG.log(Level.WARNING,
+                                        "There was an error while executing a command.",
+                                        e);
+                            }
+                        } else {
+                            command.printUsage(event.getMessage().getTextChannel());
+                        }
+                    } else if(!command.requiresOwner()) {
                         if(command.validateCall(messageContent)) {
                             try {
                                 command.onCall(command.parseCommand(messageContent),
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/HelpCommand.java b/src/main/java/com/github/bustedearlobes/themis/commands/HelpCommand.java
@@ -11,7 +11,7 @@ public class HelpCommand extends Command {
     private static final String REGEX = "^help( (\\w+))?$";
     
     public HelpCommand() {
-        super("help", REGEX);
+        super("help", REGEX, false);
     }
 
     @Override
@@ -36,6 +36,28 @@ public void onCall(Matcher fullCommand, Message message, JDA jda, Themis themis)
                 }
                 message.getTextChannel().sendMessage(sb.toString()).complete();
             }
+        } else {
+            if(fullCommand.group(1) != null) {
+                for(Command command : themis.getCommandListener().getCommands()) {
+                    if(command.getCommandName().equals(fullCommand.group(2)) && !command.requiresOwner()) {
+                        command.printUsage(message.getTextChannel());
+                    }
+                }
+            } else {
+                StringBuilder sb = new StringBuilder(4000);
+                sb.append("Commands:\n\n");
+                for(Command command : themis.getCommandListener().getCommands()) {
+                    if(!command.requiresOwner()) {
+                        sb.append(command.getCommandManual()).append("\n");
+                    }
+                }
+                String outString = sb.toString();
+                while(outString.length() >= 2000) {
+                    message.getTextChannel().sendMessage(outString.substring(0, 2000)).complete();
+                    outString = outString.substring(1999);
+                }
+                message.getTextChannel().sendMessage(sb.toString()).complete();
+            }
         }
     }
     
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/MusicCommand.java b/src/main/java/com/github/bustedearlobes/themis/commands/MusicCommand.java
@@ -26,7 +26,7 @@ public class MusicCommand extends Command {
     private static final int CAPTURE_GROUP_SKIP = 3;
     
     public MusicCommand() {
-        super("music", REGEX);
+        super("music", REGEX, false);
     }
 
     @Override
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/MuteCommand.java b/src/main/java/com/github/bustedearlobes/themis/commands/MuteCommand.java
@@ -19,7 +19,7 @@ public class MuteCommand extends Command {
     
     
     public MuteCommand() {
-        super("mute", REGEX);
+        super("mute", REGEX, true);
     }
 
     @Override
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/ShutdownCommand.java b/src/main/java/com/github/bustedearlobes/themis/commands/ShutdownCommand.java
@@ -13,7 +13,7 @@ public class ShutdownCommand extends Command {
     private static final String REGEX = "^shutdown$";
     
     public ShutdownCommand() {
-        super("shutdown", REGEX);
+        super("shutdown", REGEX, true);
     }
 
     @Override
diff --git a/src/main/java/com/github/bustedearlobes/themis/commands/UnmuteCommand.java b/src/main/java/com/github/bustedearlobes/themis/commands/UnmuteCommand.java
@@ -18,7 +18,7 @@ public class UnmuteCommand extends Command {
     
     
     public UnmuteCommand() {
-        super("unmute", REGEX);
+        super("unmute", REGEX, true);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class ClearCommand extends Command {`
`17`	`17`	`private static final int DEFAULT_CLEAR_NUMBER = 100;`
`18`	`18`
`19`	`19`	`public ClearCommand() {`
`20`		`- super("clear", REGEX);`
	`20`	`+ super("clear", REGEX, true);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,11 @@`
`12`	`12`	`public abstract class Command {`
`13`	`13`	`private Pattern pattern;`
`14`	`14`	`private String commandName;`
	`15`	`+ private boolean requiresOwner;`
`15`	`16`
`16`		`- public Command(String commandName, String regexValidation) {`
	`17`	`+ public Command(String commandName, String regexValidation, boolean requiresOwner) {`
`17`	`18`	`pattern = Pattern.compile(regexValidation);`
	`19`	`+ this.requiresOwner = requiresOwner;`
`18`	`20`	`this.commandName = commandName;`
`19`	`21`	`}`
`20`	`22`
`@@ -69,6 +71,10 @@ public void printUsage(TextChannel textChannel) {`
`69`	`71`	`textChannel.sendMessage("Usage:\n\n" + getFullCommandManual().toString()).complete();`
`70`	`72`	`}`
`71`	`73`
	`74`	`+ public boolean requiresOwner() {`
	`75`	`+ return requiresOwner;`
	`76`	`+ }`
	`77`	`+`
`72`	`78`	`protected abstract void onCall(Matcher fullCommand, Message message, JDA jda, Themis themis);`
`73`	`79`
`74`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class MusicCommand extends Command {`
`26`	`26`	`private static final int CAPTURE_GROUP_SKIP = 3;`
`27`	`27`
`28`	`28`	`public MusicCommand() {`
`29`		`- super("music", REGEX);`
	`29`	`+ super("music", REGEX, false);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class MuteCommand extends Command {`
`19`	`19`
`20`	`20`
`21`	`21`	`public MuteCommand() {`
`22`		`- super("mute", REGEX);`
	`22`	`+ super("mute", REGEX, true);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class ShutdownCommand extends Command {`
`13`	`13`	`private static final String REGEX = "^shutdown$";`
`14`	`14`
`15`	`15`	`public ShutdownCommand() {`
`16`		`- super("shutdown", REGEX);`
	`16`	`+ super("shutdown", REGEX, true);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class UnmuteCommand extends Command {`
`18`	`18`
`19`	`19`
`20`	`20`	`public UnmuteCommand() {`
`21`		`- super("unmute", REGEX);`
	`21`	`+ super("unmute", REGEX, true);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`