Bug and language fixes.

diff --git a/src/net/rizon/bncbot/UserDB.java b/src/net/rizon/bncbot/UserDB.java
index 439cf5ba02477239f341181d5ebbbf195cfe891d..ad8f8c238286aca8c8c6c013aa281f529e93b639 100644 (file)
--- a/src/net/rizon/bncbot/UserDB.java
+++ b/src/net/rizon/bncbot/UserDB.java
@@ -487,7 +487,7 @@ public final class UserDB implements Iterable<UserDB.UserEntry> {
        }\r
 \r
        public void logConnectEvent(String username, UserLogEntryType type, String ip) {\r
-               logEvent("IP %s %sed to user '%s'.", ip, type.toString(), username);\r
+               logEvent("IP %s %sed %s user '%s'.", ip, type.toString(), type == UserLogEntryType.attach ? "to" : "from", username);\r
        }\r
 \r
        private boolean logEvent(String event) {\r
@@ -741,17 +741,6 @@ public final class UserDB implements Iterable<UserDB.UserEntry> {
        }\r
 \r
        public static enum UserLogEntryType {\r
-               Attach {\r
-                       @Override\r
-                       public String toString() {\r
-                               return "attach";\r
-                       }\r
-               },\r
-               Detach {\r
-                       @Override\r
-                       public String toString() {\r
-                               return "detach";\r
-                       }\r
-               }\r
+               attach, detach\r
        }\r
 }\r

diff --git a/src/net/rizon/bncmanager/BncServer.java b/src/net/rizon/bncmanager/BncServer.java
index ed245b743c77e8b00623f44c3e7fe9c6d8043b29..b3120c54614be293cb02d955e02bca350b2a529e 100644 (file)
--- a/src/net/rizon/bncmanager/BncServer.java
+++ b/src/net/rizon/bncmanager/BncServer.java
@@ -488,8 +488,8 @@ public class BncServer {
                                Pattern hostsStartParse = Pattern.compile("^:\\*status!.*@.* PRIVMSG .* :\\| Host *\\|");\r
                                Pattern hostsParse = Pattern.compile("^:\\*status!.*@.* PRIVMSG .* :\\| ([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}) \\|");\r
                                Pattern adminReply = Pattern.compile("^:\\*admin!.*@.* PRIVMSG .* :(.*)$");\r
-                               Pattern notifyConnectPattern = Pattern.compile("^:\\*status!.*@.* PRIVMSG .* :\\*{3} (.*) (attach|detach)ed \\((from|gone:) " +\r
-                                       "([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}) \\)");\r
+                               Pattern notifyConnectPattern = Pattern.compile("^:\\*status!.*@.* NOTICE [^:]* :\\*{3} (.*) (attach|detach)ed \\((from|gone:) " +\r
+                                       "([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})\\)");\r
                                String line, words[];\r
                                while (BncBot.get().running && socket.isConnected() && !Thread.interrupted()) {\r
                                        line = netIn.readLine();\r