Merge pull request #760 from csmith/master

Add "unstyled" formatter func to strip control codes.
DMDirc · Jan 2, 2017 · 484ebba · 484ebba
2 parents bd00c55 + 65174b6
commit 484ebba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/main/java/com/dmdirc/ui/messages/EventPropertyManager.java b/src/main/java/com/dmdirc/ui/messages/EventPropertyManager.java
@@ -54,6 +54,7 @@ public EventPropertyManager() {
         functions.put("lowercase", String::toLowerCase);
         functions.put("trim", String::trim);
         functions.put("bracketed", s -> Strings.isNullOrEmpty(s) ? "" : " (" + s + ')');
+        functions.put("unstyled", new StyledMessageUtils()::stripControlCodes);
     }
 
     public <S> Optional<Object> getProperty(final S object, final Class<? extends S> type, final String property) {

diff --git a/src/test/java/com/dmdirc/ui/messages/EventPropertyManagerTest.java b/src/test/java/com/dmdirc/ui/messages/EventPropertyManagerTest.java
@@ -56,6 +56,7 @@ public void testAppliesBuiltInFunctions() {
         assertEquals("test 123", manager.applyFunction("TeSt 123", "lowercase"));
         assertEquals("TEST 123", manager.applyFunction("TeSt 123", "uppercase"));
         assertEquals("TeSt 123", manager.applyFunction("  TeSt 123  ", "trim"));
+        assertEquals("TeSt 123", manager.applyFunction("\2TeSt \4FFFFFF123", "unstyled"));
     }
 
     @Test