Don’t expose the complete reply object from the notice event.
[xudocci.git] / src / main / java / net / pterodactylus / irc / Connection.java
index 6354c90..f6b7913 100644 (file)
@@ -18,6 +18,7 @@
 package net.pterodactylus.irc;
 
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import java.io.BufferedReader;
@@ -33,7 +34,6 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -42,12 +42,13 @@ import javax.net.SocketFactory;
 
 import net.pterodactylus.irc.connection.ChannelNotJoinedHandler;
 import net.pterodactylus.irc.connection.ConnectionEstablishHandler;
+import net.pterodactylus.irc.connection.Handler;
+import net.pterodactylus.irc.connection.MotdHandler;
+import net.pterodactylus.irc.connection.PrefixHandler;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
 import net.pterodactylus.irc.event.ChannelNicknames;
-import net.pterodactylus.irc.event.ChannelNotJoined;
-import net.pterodactylus.irc.event.ChannelNotJoined.Reason;
 import net.pterodactylus.irc.event.ChannelNoticeReceived;
 import net.pterodactylus.irc.event.ChannelTopic;
 import net.pterodactylus.irc.event.ClientQuit;
@@ -57,7 +58,6 @@ import net.pterodactylus.irc.event.ConnectionFailed;
 import net.pterodactylus.irc.event.DccAcceptReceived;
 import net.pterodactylus.irc.event.DccSendReceived;
 import net.pterodactylus.irc.event.KickedFromChannel;
-import net.pterodactylus.irc.event.MotdReceived;
 import net.pterodactylus.irc.event.NicknameChanged;
 import net.pterodactylus.irc.event.NicknameInUseReceived;
 import net.pterodactylus.irc.event.NoNicknameGivenReceived;
@@ -70,7 +70,6 @@ import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
 import net.pterodactylus.xdcc.util.io.BandwidthCountingOutputStream;
 
 import com.google.common.base.Optional;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -372,18 +371,16 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                /* now read replies and react. */
                try {
                        /* some status variables. */
-                       int oldConnectionStatus = 0;
-                       int connectionStatus = 0;
                        boolean connected = true;
-                       StringBuilder motd = new StringBuilder();
                        Set<Nickname> nicks = Sets.newHashSet();
 
-                       /* server modes. */
-                       Map<String, String> nickPrefixes = Maps.newHashMap();
-                       Set<Character> channelTypes = Sets.newHashSet();
-
-                       ConnectionEstablishHandler connectionEstablishHandler = new ConnectionEstablishHandler(eventBus, this);
-                       ChannelNotJoinedHandler channelNotJoinedHandler = new ChannelNotJoinedHandler(eventBus, this);
+                       PrefixHandler prefixHandler = new PrefixHandler();
+                       List<Handler> handlers = asList(
+                                       new MotdHandler(eventBus, this),
+                                       new ChannelNotJoinedHandler(eventBus, this),
+                                       new ConnectionEstablishHandler(eventBus, this),
+                                       prefixHandler
+                       );
 
                        while (connected) {
                                Reply reply = connectionHandler.readReply();
@@ -392,6 +389,13 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                String command = reply.command();
                                List<String> parameters = reply.parameters();
 
+                               for (Handler handler : handlers) {
+                                       if (handler.willHandle(reply)) {
+                                               handler.handleReply(reply);
+                                               break;
+                                       }
+                               }
+
                                /* most common events. */
                                if (command.equalsIgnoreCase("PRIVMSG")) {
                                        String recipient = parameters.get(0);
@@ -399,7 +403,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                        if (message.startsWith("\u0001") && message.endsWith("\u0001")) {
                                                /* CTCP! */
                                                handleCtcp(reply.source().get(), message);
-                                       } else if (!channelTypes.contains(recipient.charAt(0))) {
+                                       } else if (!prefixHandler.isChannel(recipient)) {
                                                eventBus.post(new PrivateMessageReceived(this, reply.source().get(), message));
                                        } else {
                                                eventBus.post(new ChannelMessageReceived(this, recipient, reply.source().get(), message));
@@ -411,8 +415,8 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                        if (message.startsWith("\u0001") && message.endsWith("\u0001")) {
                                                /* CTCP! */
                                                handleCtcp(reply.source().get(), message);
-                                       } else if (!channelTypes.contains(recipient.charAt(0))) {
-                                               eventBus.post(new PrivateNoticeReceived(this, reply));
+                                       } else if (!prefixHandler.isChannel(recipient)) {
+                                               eventBus.post(new PrivateNoticeReceived(this, reply.source().get(), message));
                                        } else {
                                                eventBus.post(new ChannelNoticeReceived(this, reply.source().get(), recipient, message));
                                        }
@@ -421,7 +425,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                } else if (command.equals("431")) {
                                        eventBus.post(new NoNicknameGivenReceived(this, reply));
                                } else if (command.equals("433")) {
-                                       if (connectionStatus == 0) {
+                                       if (!established.get()) {
                                                nickname = nicknameChooser.getNickname();
                                                connectionHandler.sendCommand("NICK", nickname);
                                        } else {
@@ -441,7 +445,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                        eventBus.post(new ChannelTopic(this, parameters.get(1), parameters.get(2)));
                                } else if (command.equals("353")) {
                                        for (String nickname : parameters.get(3).split(" ")) {
-                                               if (nickPrefixes.containsKey(nickname.substring(0, 1))) {
+                                               if (prefixHandler.isNickPrefixed(nickname)) {
                                                        nicks.add(new Nickname(nickname.substring(1), nickname.substring(0, 1)));
                                                } else {
                                                        nicks.add(new Nickname(nickname, ""));
@@ -455,49 +459,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                } else if (command.equalsIgnoreCase("QUIT")) {
                                        eventBus.post(new ClientQuit(this, reply.source().get(), parameters.get(0)));
 
-                               } else if (channelNotJoinedHandler.willHandle(reply)) {
-                                       channelNotJoinedHandler.handleReply(reply);
-
                                /* basic connection housekeeping. */
                                } else if (command.equalsIgnoreCase("PING")) {
                                        connectionHandler.sendCommand("PONG", getOptional(parameters, 0), getOptional(parameters, 1));
 
-                               } else if (connectionEstablishHandler.willHandle(reply)) {
-                                       connectionEstablishHandler.handleReply(reply);
-
-                               /* 005 originally was a bounce message, now used to transmit useful information about the server. */
-                               } else if (command.equals("005")) {
-                                       for (String parameter : parameters) {
-                                               if (parameter.startsWith("PREFIX=")) {
-                                                       int openParen = parameter.indexOf('(');
-                                                       int closeParen = parameter.indexOf(')');
-                                                       if ((openParen != -1) && (closeParen != -1)) {
-                                                               for (int modeCharacterIndex = 1; modeCharacterIndex < (closeParen - openParen); ++modeCharacterIndex) {
-                                                                       char modeCharacter = parameter.charAt(openParen + modeCharacterIndex);
-                                                                       char modeSymbol = parameter.charAt(closeParen + modeCharacterIndex);
-                                                                       nickPrefixes.put(String.valueOf(modeSymbol), String.valueOf(modeCharacter));
-                                                               }
-                                                               logger.debug(String.format("Parsed Prefixes: %s", nickPrefixes));
-                                                       }
-                                               } else if (parameter.startsWith("CHANTYPES=")) {
-                                                       for (int typeIndex = 10; typeIndex < parameter.length(); ++typeIndex) {
-                                                               channelTypes.add(parameter.charAt(typeIndex));
-                                                       }
-                                                       logger.debug(String.format("Parsed Channel Types: %s", channelTypes));
-                                               }
-                                       }
-
-                               /* 375, 372, and 376 handle the server’s MOTD. */
-                               } else if (command.equals("375")) {
-                                       /* MOTD starts. */
-                                       motd.append(parameters.get(1)).append('\n');
-                               } else if (command.equals("372")) {
-                                       motd.append(parameters.get(1)).append('\n');
-                               } else if (command.equals("376")) {
-                                       motd.append(parameters.get(1)).append('\n');
-                                       eventBus.post(new MotdReceived(this, motd.toString()));
-                                       motd.setLength(0);
-
                                } else if (command.equalsIgnoreCase("KICK")) {
                                        eventBus.post(new KickedFromChannel(this, parameters.get(0), reply.source().get(), parameters.get(1), getOptional(parameters, 2)));