Escape the input, not the output

[xudocci.git] / src / main / java / net / pterodactylus / irc / DefaultConnection.java

diff --git a/src/main/java/net/pterodactylus/irc/DefaultConnection.java b/src/main/java/net/pterodactylus/irc/DefaultConnection.java
index 876aefb..dd6955c 100644 (file)
--- a/src/main/java/net/pterodactylus/irc/DefaultConnection.java
+++ b/src/main/java/net/pterodactylus/irc/DefaultConnection.java
@@ -316,7 +316,7 @@ public class DefaultConnection extends AbstractExecutionThreadService implements
                        while (connected) {
                                Reply reply = connectionHandler.readReply();
                                eventBus.post(new ReplyReceived(this, reply));
-                               logger.trace(String.format("<< %s", reply));
+                               logger.trace(String.format("<< %s", addEscapeCharacters(reply.toString())));
                                String command = reply.command();
                                List<String> parameters = reply.parameters();
 
@@ -378,6 +378,18 @@ public class DefaultConnection extends AbstractExecutionThreadService implements
        // PRIVATE METHODS
        //
 
+       private String addEscapeCharacters(String line) {
+               StringBuilder escaped = new StringBuilder();
+               for (char c : line.toCharArray()) {
+                       if (c < 32) {
+                               escaped.append("\\CTRL[").append((int) c).append("]");
+                       } else {
+                               escaped.append(c);
+                       }
+               }
+               return escaped.toString();
+       }
+
        /**
         * Returns an item from the list, or {@link Optional#empty()} if the list is
         * shorter than required for the given index.