Fix stripping nickname control codes.

Closes #751

src/main/java/com/dmdirc/ui/messages/StyledMessageUtils.java

@@ -46,11 +46,11 @@ public class StyledMessageUtils {
      */
     public String stripControlCodes(final String input) {
         return input.replaceAll("[" + IRCControlCodes.BOLD + CODE_CHANNEL + IRCControlCodes.FIXED
-                + CODE_HYPERLINK + IRCControlCodes.ITALIC + IRCControlCodes.NEGATE + CODE_NICKNAME
+                + CODE_HYPERLINK + IRCControlCodes.ITALIC + IRCControlCodes.NEGATE
                 + CODE_SMILIE + IRCControlCodes.STOP + IRCControlCodes.UNDERLINE + "]|"
                 + IRCControlCodes.COLOUR_HEX + "([A-Za-z0-9]{6}(,[A-Za-z0-9]{6})?)?|"
                 + IRCControlCodes.COLOUR + "([0-9]{1,2}(,[0-9]{1,2})?)?", "")
-                .replaceAll(CODE_TOOLTIP + ".*?" + CODE_TOOLTIP + "(.*?)" + CODE_TOOLTIP, "$1");
+                .replaceAll("([" + CODE_TOOLTIP + CODE_NICKNAME + "]).*?\\1(.*?)\\1", "$2");
     }
 
     /**
@@ -108,10 +108,9 @@ public class StyledMessageUtils {
      * @return a copy of the input with control codes removed
      */
     private String stripInternalControlCodes(final String input) {
-        return input.replaceAll("[" + CODE_CHANNEL + CODE_HYPERLINK + CODE_NICKNAME
+        return input.replaceAll("[" + CODE_CHANNEL + CODE_HYPERLINK
                 + CODE_SMILIE + IRCControlCodes.STOP + IRCControlCodes.UNDERLINE + ']', "")
-                .replaceAll(CODE_TOOLTIP + ".*?" + CODE_TOOLTIP + "(.*?)"
-                        + CODE_TOOLTIP, "$1");
+                .replaceAll("([" + CODE_TOOLTIP + CODE_NICKNAME + "]).*?\\1(.*?)\\1", "$2");
     }
 
 }

src/test/java/com/dmdirc/ui/messages/StyledMessageUtilsTest.java

@@ -55,4 +55,12 @@ public class StyledMessageUtilsTest {
         assertEquals(expResult, result);
     }
 
+    @Test
+    public void testStripControlCodesNicknames() {
+        final String input = "Link to \020Someone's long name\020\002Someone\002\020...";
+        final String expResult = "Link to Someone...";
+        final String result = styleUtils.stripControlCodes(input);
+        assertEquals(expResult, result);
+    }
+
 }