Remove hardcoded nicknames

diff --git a/src/net/rizon/bncbot/commands/BncIPLogCmd.java b/src/net/rizon/bncbot/commands/BncIPLogCmd.java
index 7e6187b46c33e097e1739364c629bf6f9093e2d3..404e4a0aad2cbea8ff204f92bb4743c8d68aa638 100644 (file)
--- a/src/net/rizon/bncbot/commands/BncIPLogCmd.java
+++ b/src/net/rizon/bncbot/commands/BncIPLogCmd.java
@@ -31,7 +31,7 @@ public class BncIPLogCmd extends AbstractSimpleCommand {
                String value = args[4];\r
 \r
                // Check to make sure is oper or me!\r
-               boolean ident = nick.equals("Nol888") || bot.lookupOper(nick);\r
+               boolean ident = bot.lookupOper(nick);\r
                if (!ident) {\r
                        // Silently ignore the command.\r
                        return;\r

diff --git a/src/net/rizon/bncbot/commands/SearchIPCmd.java b/src/net/rizon/bncbot/commands/SearchIPCmd.java
index 12ae4c4c34dd0e6f44803795ab8f89d8ea9a68a0..0bf3590caff3fd0399261924bef58d15ea8ca8a6 100644 (file)
--- a/src/net/rizon/bncbot/commands/SearchIPCmd.java
+++ b/src/net/rizon/bncbot/commands/SearchIPCmd.java
@@ -22,7 +22,7 @@ public class SearchIPCmd extends AbstractSimpleCommand {
                String nick = user.split("!")[0];\r
 \r
                // Check to make sure is oper or me!\r
-               boolean ident = nick.equals("Nol888") || bot.lookupOper(nick);\r
+               boolean ident = bot.lookupOper(nick);\r
                if (!ident) {\r
                        // Silently ignore the command.\r
                        return;\r

diff --git a/src/net/rizon/bncbot/commands/ShutdownCmd.java b/src/net/rizon/bncbot/commands/ShutdownCmd.java
index 0ddb396188ee6920b3f3768a4fdcbd44850f8275..8d20a03fc621d13be6edf5b3a1ee86610df4f3b7 100644 (file)
--- a/src/net/rizon/bncbot/commands/ShutdownCmd.java
+++ b/src/net/rizon/bncbot/commands/ShutdownCmd.java
@@ -10,11 +10,21 @@ public class ShutdownCmd extends AbstractSimpleCommand {
                super.prepare(line);\r
                \r
                // Checking for admin channel-age.\r
-               return args[2].equalsIgnoreCase(bot.getAdminChannel()) && (args[0].startsWith(":Nol888!") || args[0].startsWith(":MoeMoeYuki!"));\r
+               return args[2].equalsIgnoreCase(bot.getAdminChannel());\r
        }\r
        \r
        @Override\r
        public void run() {\r
+               String user = args[0].substring(1);\r
+               String nick = user.split("!")[0];\r
+\r
+               // Check to make sure is oper or me!\r
+               boolean ident = bot.lookupOper(nick);\r
+               if (!ident) {\r
+                       // Silently ignore the command.\r
+                       return;\r
+               }\r
+\r
                bot.stdPrintln("Shutting down on request from IRC.");\r
 \r
                bot.running = false;\r