Make bot commands not require .yml extension in commands.

cnaude · Oct 19, 2014 · fab5da9 · fab5da9
1 parent 06972b9
commit fab5da9
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/Commands/AddOp.java b/src/main/java/com/cnaude/purpleirc/Commands/AddOp.java
@@ -34,7 +34,7 @@ public AddOp(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 // #channel, user

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/AddVoice.java b/src/main/java/com/cnaude/purpleirc/Commands/AddVoice.java
@@ -34,7 +34,7 @@ public AddVoice(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 // #channel, user

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Connect.java b/src/main/java/com/cnaude/purpleirc/Commands/Connect.java
@@ -41,7 +41,7 @@ public void dispatch(CommandSender sender, String[] args) {
                 ircBot.asyncConnect(sender);
             }
         } else if (args.length == 2) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             if (plugin.ircBots.containsKey(bot)) {
                 plugin.ircBots.get(bot).asyncConnect(sender);
             } else {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Disconnect.java b/src/main/java/com/cnaude/purpleirc/Commands/Disconnect.java
@@ -41,7 +41,7 @@ public void dispatch(CommandSender sender, String[] args) {
                 ircBot.asyncQuit(sender);
             }
         } else if (args.length == 2) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             if (plugin.ircBots.containsKey(bot)) {
                 plugin.ircBots.get(bot).asyncQuit(sender);
             } else {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Join.java b/src/main/java/com/cnaude/purpleirc/Commands/Join.java
@@ -36,7 +36,7 @@ public Join(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length >= 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             String password = "";
             if (args.length >= 4) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Kick.java b/src/main/java/com/cnaude/purpleirc/Commands/Kick.java
@@ -36,7 +36,7 @@ public Kick(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 for (int i = 3; i < args.length; i++) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Leave.java b/src/main/java/com/cnaude/purpleirc/Commands/Leave.java
@@ -37,7 +37,7 @@ public Leave(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length >= 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             String reason = "";
             if (args.length >= 4) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/List.java b/src/main/java/com/cnaude/purpleirc/Commands/List.java
@@ -40,7 +40,7 @@ public void dispatch(CommandSender sender, String[] args) {
                 ircBot.sendUserList(sender);
             }
         } else if (args.length > 1) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             if (plugin.ircBots.containsKey(bot)) {
                 PurpleBot ircBot = plugin.ircBots.get(bot);
                 if (args.length > 2) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/ListOps.java b/src/main/java/com/cnaude/purpleirc/Commands/ListOps.java
@@ -36,7 +36,7 @@ public ListOps(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 if (plugin.ircBots.get(bot).opsList.containsKey(channelName)) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/ListVoices.java b/src/main/java/com/cnaude/purpleirc/Commands/ListVoices.java
@@ -32,7 +32,7 @@ public ListVoices(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 if (plugin.ircBots.get(bot).voicesList.containsKey(channelName)) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Login.java b/src/main/java/com/cnaude/purpleirc/Commands/Login.java
@@ -36,7 +36,7 @@ public Login(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String login = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 plugin.ircBots.get(bot).changeLogin(sender, login);

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/MessageDelay.java b/src/main/java/com/cnaude/purpleirc/Commands/MessageDelay.java
@@ -37,7 +37,7 @@ public MessageDelay(PurpleIRC plugin) {
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 3) {
             if (args[2].matches("\\d+")) {
-                String bot = args[1];
+                String bot = plugin.botify(args[1]);
                 if (plugin.ircBots.containsKey(bot)) {
                     long delay = Long.parseLong(args[2]);
                     plugin.ircBots.get(bot).setIRCDelay(sender, delay);
@@ -48,7 +48,7 @@ public void dispatch(CommandSender sender, String[] args) {
                 sender.sendMessage(fullUsage);
             }
         } else if (args.length == 2) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             if (plugin.ircBots.containsKey(bot)) {
                 sender.sendMessage(ChatColor.WHITE + "IRC message delay is currently "
                         + plugin.ircBots.get(bot).getMessageDelay() + " ms.");

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Nick.java b/src/main/java/com/cnaude/purpleirc/Commands/Nick.java
@@ -37,7 +37,7 @@ public Nick(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String nick = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 if (plugin.ircBots.containsKey(nick)) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Op.java b/src/main/java/com/cnaude/purpleirc/Commands/Op.java
@@ -36,7 +36,7 @@ public Op(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length >= 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 for (int i = 3; i < args.length; i++) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/ReloadBot.java b/src/main/java/com/cnaude/purpleirc/Commands/ReloadBot.java
@@ -36,7 +36,7 @@ public ReloadBot(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 2) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             if (plugin.ircBots.containsKey(bot)) {
                 plugin.ircBots.get(bot).reload(sender);
             } else {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/ReloadBotConfig.java b/src/main/java/com/cnaude/purpleirc/Commands/ReloadBotConfig.java
@@ -36,7 +36,7 @@ public ReloadBotConfig(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 2) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             if (plugin.ircBots.containsKey(bot)) {
                 plugin.ircBots.get(bot).reloadConfig(sender);
             } else {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/RemoveOp.java b/src/main/java/com/cnaude/purpleirc/Commands/RemoveOp.java
@@ -36,7 +36,7 @@ public RemoveOp(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channel = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 // #channel, user

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/RemoveVoice.java b/src/main/java/com/cnaude/purpleirc/Commands/RemoveVoice.java
@@ -32,7 +32,7 @@ public RemoveVoice(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length == 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channel = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 // #channel, user

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Save.java b/src/main/java/com/cnaude/purpleirc/Commands/Save.java
@@ -41,7 +41,7 @@ public void dispatch(CommandSender sender, String[] args) {
                 ircBot.saveConfig(sender);
             }
         } else if (args.length >= 2) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             if (plugin.ircBots.containsKey(bot)) {
                 plugin.ircBots.get(bot).saveConfig(sender);
             } else {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Say.java b/src/main/java/com/cnaude/purpleirc/Commands/Say.java
@@ -36,7 +36,7 @@ public Say(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length >= 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 String msg = "";

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Server.java b/src/main/java/com/cnaude/purpleirc/Commands/Server.java
@@ -36,7 +36,7 @@ public Server(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length >= 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String server = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 if (args.length == 3) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Voice.java b/src/main/java/com/cnaude/purpleirc/Commands/Voice.java
@@ -32,7 +32,7 @@ public Voice(PurpleIRC plugin) {
     @Override
     public void dispatch(CommandSender sender, String[] args) {
         if (args.length >= 4) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String channelName = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 for (int i = 3; i < args.length; i++) {

diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Whois.java b/src/main/java/com/cnaude/purpleirc/Commands/Whois.java
@@ -42,7 +42,7 @@ public void dispatch(CommandSender sender, String[] args) {
                 ircBot.sendUserWhois(sender, nick);
             }
         } else if (args.length == 3) {
-            String bot = args[1];
+            String bot = plugin.botify(args[1]);
             String nick = args[2];
             if (plugin.ircBots.containsKey(bot)) {
                 PurpleBot ircBot = plugin.ircBots.get(bot);