Fixes issue 2742 (Austhex uses +q and +a)

Fixes issue 2743 (Austhex now calls itself 8.1.6)
Fixes issue 2745 (Austirc is now IRSee)
Fixes issue 2739 (Support for ircd-seven)
Fixes issue 2740 (Support for ircd-rizon)
Fixes issue 3178 (Plexus +eI)
Fixes issue 3044 (Austhex +eI)

Change-Id: Ib35c724607e4167f572201fcd322ad9533f3eaa2
Reviewed-on: http://gerrit.dmdirc.com/428
Reviewed-by: Chris Smith <chris@dmdirc.com>
Tested-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -148,7 +148,7 @@ public class IRCChannelInfo implements ChannelInfo {
         final boolean isOpped = me.getImportantModeValue() > voiceValue;
         
         int modecount = 1;
-        if (serverType != ServerType.UNREAL && myParser.h005Info.containsKey("MODES")) {
+        if (serverType != ServerType.UNREAL && serverType != ServerType.IRSEE && myParser.h005Info.containsKey("MODES")) {
             try {
                 modecount = Integer.parseInt(myParser.h005Info.get("MODES"));
             } catch (NumberFormatException e) { /* use default modecount */}
@@ -495,8 +495,8 @@ public class IRCChannelInfo implements ChannelInfo {
         
         // Hyperion sucks.
         if (cMode == 'b' || cMode == 'q') {
-            final String thisIRCD = myParser.getIRCD(true).toLowerCase();
-            if ((thisIRCD.equals("hyperion") || thisIRCD.equals("dancer"))) {
+            final ServerType serverType = myParser.getServerType();
+            if ((serverType == ServerType.DANCER || serverType == ServerType.HYPERION)) {
                 if (cMode == 'b' && givenItem.getItem().charAt(0) == '%') {
                     cMode = 'q';
                 } else if (cMode == 'q' && givenItem.getItem().charAt(0) != '%') {

src/com/dmdirc/parser/irc/ProcessListModes.java

@@ -44,7 +44,7 @@ public class ProcessListModes extends IRCProcessor {
     @Override
     public void process(String sParam, String[] token) {
         IRCChannelInfo channel = getChannel(token[3]);
-        String thisIRCD = myParser.getIRCD(true).toLowerCase();
+        final ServerType serverType = myParser.getServerType();
         String item = "";
         String owner = "";
         byte tokenStart = 4; // Where do the relevent tokens start?
@@ -56,7 +56,8 @@ public class ProcessListModes extends IRCProcessor {
         
         if (sParam.equals("367") || sParam.equals("368")) {
             // Ban List/Item.
-            // (Also used for +d and +q on hyperion... -_-)
+            // (Also used for +d and +q on dancer/hyperion... -_-)
+            // (Also used for +q on ircd-seven... -_-)
             mode = 'b';
             isItem = sParam.equals("367");
         } else if (sParam.equals("348") || sParam.equals("349")) {
@@ -73,19 +74,19 @@ public class ProcessListModes extends IRCProcessor {
             isItem = sParam.equals("941");
         } else if (sParam.equals("344") || sParam.equals("345")) {
             // Reop List, or bad words list, or quiet list. god damn.
-            if (thisIRCD.equals("euircd")) {
+            if (serverType == ServerType.EUIRCD) {
                 mode = 'w';
-            } else if (thisIRCD.equals("oftc-hybrid")) {
+            } else if (serverType == ServerType.OFTC_HYBRID) {
                 mode = 'q';
             } else {
                 mode = 'R';
             }
             isItem = sParam.equals("344");
-        } else if (thisIRCD.equals("swiftirc") && (sParam.equals("386") || sParam.equals("387"))) {
+        } else if ((serverType == ServerType.SWIFTIRC || serverType == ServerType.AUSTHEX8) && (sParam.equals("386") || sParam.equals("387"))) {
             // Channel Owner list
             mode = 'q';
             isItem = sParam.equals("387");
-        } else if (thisIRCD.equals("swiftirc") && (sParam.equals("388") || sParam.equals("389"))) {
+        } else if ((serverType == ServerType.SWIFTIRC || serverType == ServerType.AUSTHEX8) && (sParam.equals("388") || sParam.equals("389"))) {
             // Protected User list
             mode = 'a';
             isItem = sParam.equals("389");
@@ -117,7 +118,7 @@ public class ProcessListModes extends IRCProcessor {
                     //
                     // Only raise an LMQ error if the lmqmode isn't one of bdq if the
                     // guess is one of bdq
-                    if ((thisIRCD.equals("hyperion") || thisIRCD.equals("dancer")) && (mode == 'b' || mode == 'q' || mode == 'd')) {
+                    if ((serverType == ServerType.DANCER || serverType == ServerType.HYPERION) && (mode == 'b' || mode == 'q' || mode == 'd')) {
                         LinkedList<Character> lmq = (LinkedList<Character>)listModeQueue;
                         if (mode == 'b') {
                             error = !(oldMode == 'q' || oldMode == 'd');
@@ -130,8 +131,16 @@ public class ProcessListModes extends IRCProcessor {
                         } else if (mode == 'd') {
                             error = !(oldMode == 'b' || oldMode == 'q');
                         }
+                    } else if ((serverType == ServerType.IRCD_SEVEN || serverType == ServerType.CHARYBDIS) && (mode == 'b' || mode == 'q')) {
+                        // Finally freenode appear to have an ircd which isn't completely annoying.
+                        // Only error if the LMQ thinks the mode should be
+                        // something thats not the other one of these 2 modes.
+                        error = (mode == 'b') ? oldMode != 'q' : oldMode != 'b';
                     }
-                    
+
+                    // If the lmq and the actual mode are not the same or the
+                    // freenode-specific hacks above think the mode should be
+                    // something else, error.
                     if (oldMode != mode && error) {
                         myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ disagrees with guess. LMQ: "+mode+" Guess: "+oldMode);
 //                        myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "LMQ disagrees with guess. LMQ: "+mode+" Guess: "+oldMode, myParser.getLastLine()));
@@ -145,7 +154,7 @@ public class ProcessListModes extends IRCProcessor {
         }
         
         if (isItem) {
-            if ((!isCleverMode) && listModeQueue == null && (thisIRCD.equals("hyperion") || thisIRCD.equals("dancer")) && token.length > 4 && mode == 'b') {
+            if ((!isCleverMode) && listModeQueue == null && (serverType == ServerType.DANCER || serverType == ServerType.HYPERION) && token.length > 4 && mode == 'b') {
                 // Assume mode is a 'd' mode
                 mode = 'd';
                 // Now work out if its not (or attempt to.)
@@ -153,7 +162,7 @@ public class ProcessListModes extends IRCProcessor {
                 int hoststart = token[tokenStart].indexOf('@');
                 // Check that ! and @ are both in the string - as required by +b and +q
                 if ((identstart >= 0) && (identstart < hoststart)) {
-                    if (thisIRCD.equals("hyperion") && token[tokenStart].charAt(0) == '%') { mode = 'q'; }
+                    if (serverType == ServerType.HYPERION && token[tokenStart].charAt(0) == '%') { mode = 'q'; }
                     else { mode = 'b'; }
                 }
             } // End Hyperian stupidness of using the same numeric for 3 different things..
@@ -165,7 +174,7 @@ public class ProcessListModes extends IRCProcessor {
                     myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '"+mode+"' - but channel object doesn't agree.", myParser.getLastLine()));
                 } else {
                     list.clear();
-                    if ((thisIRCD.equals("hyperion") || thisIRCD.equals("dancer")) && (mode == 'b' || mode == 'q')) {
+                    if ((serverType == ServerType.DANCER || serverType == ServerType.HYPERION) && (mode == 'b' || mode == 'q')) {
                         // Also clear the other list if b or q.
                         final Character otherMode = (mode == 'b') ? 'q' : 'b';
                         

src/com/dmdirc/parser/irc/ServerType.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *  Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
  * 
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -53,16 +53,20 @@ public enum ServerType {
     IRCU2("ircu", ".*u2\\.[0-9]+\\..*"),
     /** Some kind of IRCU Fork. */
     IRCU_GENERIC("ircu", ".*ircu.*"),
+    /** Rizon. */
+    IRCD_RIZON("ircd-rixon", ".*ircd-rizon.*", "eI"),
     /** Plexus. */
-    PLEXUS("plexus", ".*plexus.*"),
+    PLEXUS("plexus", ".*plexus.*", "eI"),
     /** OFTCs hybrid fork. */
     OFTC_HYBRID("oftc-hybrid", ".*hybrid.*oftc.*"),
     /** hybrid7. */
     HYBRID7("hybrid7", ".*ircd.hybrid.*", "eI"),
     /** Older versions of Hybrid. */
     HYBRID("hybrid", ".*hybrid.*", "eI"),
-    /** Freenodes new IRCD. */
+    /** Charybdis */
     CHARYBDIS("charybdis", ".*charybdis.*", "eI"),
+    /** Freenodes New IRCD. */
+    IRCD_SEVEN("ircd-seven", ".*ircd-seven.*", "eI"),
     /** Freenodes Current IRCD. */
     HYPERION("hyperion", ".*hyperion.*", "eI"),
     /** Freenodes Old IRCD. */
@@ -77,10 +81,14 @@ public enum ServerType {
     FQIRCD("fqircd", ".*fqircd.*"),
     /** Microsoft's Conference Room "IRCD". */
     CONFERENCEROOM("conferenceroom", ".*conferenceroom.*"),
+    /** AustHex8. */
+    AUSTHEX8("austhex8", "running version 8.1.6$", "eI", MatchType.RAW002),
     /** AustHex custom IRCD. */
     AUSTHEX("austhex", ".*austhex.*"),
     /** AustIRC custom IRCD. */
     AUSTIRC("austirc", ".*austirc.*"),
+    /** IRSEE custom IRCD. */
+    IRSEE("irsee", ".*irsee.*"),
     /** Ratbox. */
     RATBOX("ratbox", ".*ratbox.*"),
     /** euircd. */