Strip color annoying IRC color codes...

cnaude · May 11, 2014 · a1e61d2 · a1e61d2
1 parent 2f15741
commit a1e61d2
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ColorConverter.java b/src/main/java/com/cnaude/purpleirc/Utilities/ColorConverter.java
@@ -22,6 +22,7 @@ public class ColorConverter {
     private final HashMap<String, ChatColor> gameColorMap = new HashMap<String, ChatColor>();
     private final Pattern bgColorPattern;
     private final Pattern singleDigitColorPattern;
+    private final Pattern colorHack;
 
     /**
      *
@@ -38,6 +39,7 @@ public ColorConverter(PurpleIRC plugin, boolean stripGameColors, boolean stripIR
         buildDefaultColorMaps();
         this.bgColorPattern = Pattern.compile("((\\u0003\\d+),\\d+)");
         this.singleDigitColorPattern = Pattern.compile("((\\u0003)(\\d))\\D+");
+        this.colorHack = Pattern.compile("((\\u0003\\d+)(,\\d+))\\D");
     }
 
     /**
@@ -63,7 +65,7 @@ public String gameColorsToIrc(String message) {
      * @param message
      * @return
      */
-    public String ircColorsToGame(String message) {        
+    public String ircColorsToGame(String message) {
         if (stripIRCBackgroundColors) {
             Matcher m = bgColorPattern.matcher(message);
             while (m.find()) {
@@ -74,11 +76,18 @@ public String ircColorsToGame(String message) {
         try {
             Matcher m2 = singleDigitColorPattern.matcher(message);
             while (m2.find()) {
-                plugin.logDebug("Single to double: " + m2.group(3) + " => " 
+                plugin.logDebug("Single to double: " + m2.group(3) + " => "
                         + m2.group(2) + "0" + m2.group(3));
                 // replace \u0003N with \u00030N
                 message = message.replace(m2.group(1), m2.group(2) + "0" + m2.group(3));
             }
+            m2 = colorHack.matcher(message);
+            while (m2.find()) {
+                plugin.logDebug("Silly IRC colors: " + m2.group(1) + " => "
+                        + m2.group(2));
+                // replace \u0003N,N with \u00030N
+                message = message.replace(m2.group(1), m2.group(2));
+            }
         } catch (Exception ex) {
             plugin.logDebug(ex.getMessage());
         }