Show reason if channel can not be joined because the nickname is not registered.

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

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index ec063f6..2f89414 100644 (file)
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -35,8 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.concurrent.TimeUnit;
 import javax.net.SocketFactory;
 
 import net.pterodactylus.irc.event.ChannelJoined;
@@ -53,6 +52,7 @@ import net.pterodactylus.irc.event.ConnectionEstablished;
 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;
@@ -74,6 +74,7 @@ import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 import com.google.common.util.concurrent.Service;
+import org.apache.log4j.Logger;
 
 /**
  * A connection to an IRC server.
@@ -325,7 +326,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
         *              if an I/O error occurs
         */
        public void close() throws IOException {
-               connectionHandler.close();
+               if (connectionHandler != null) {
+                       connectionHandler.close();
+               }
        }
 
        //
@@ -344,6 +347,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                /* connect to remote socket. */
                try {
                        Socket socket = socketFactory.createSocket(hostname, port);
+                       socket.setSoTimeout((int) TimeUnit.MINUTES.toMillis(3));
                        connectionHandler = new ConnectionHandler(socket.getInputStream(), socket.getOutputStream());
 
                        /* register connection. */
@@ -375,7 +379,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                        while (connected) {
                                Reply reply = connectionHandler.readReply();
                                eventBus.post(new ReplyReceived(this, reply));
-                               logger.finest(String.format("<< %s", reply));
+                               logger.trace(String.format("<< %s", reply));
                                String command = reply.command();
                                List<String> parameters = reply.parameters();
 
@@ -449,6 +453,8 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                        eventBus.post(new ChannelNotJoined(this, parameters.get(1), Reason.inviteOnly));
                                } else if (command.equals("475")) {
                                        eventBus.post(new ChannelNotJoined(this, parameters.get(1), Reason.badChannelKey));
+                               } else if (command.equals("477")) {
+                                       eventBus.post(new ChannelNotJoined(this, parameters.get(1), Reason.registeredNicknamesOnly));
 
                                /* basic connection housekeeping. */
                                } else if (command.equalsIgnoreCase("PING")) {
@@ -476,13 +482,13 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                                                        char modeSymbol = parameter.charAt(closeParen + modeCharacterIndex);
                                                                        nickPrefixes.put(String.valueOf(modeSymbol), String.valueOf(modeCharacter));
                                                                }
-                                                               logger.fine(String.format("Parsed Prefixes: %s", nickPrefixes));
+                                                               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.fine(String.format("Parsed Channel Types: %s", channelTypes));
+                                                       logger.debug(String.format("Parsed Channel Types: %s", channelTypes));
                                                }
                                        }
 
@@ -497,6 +503,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                        eventBus.post(new MotdReceived(this, motd.toString()));
                                        motd.setLength(0);
 
+                               } else if (command.equals("KICK")) {
+                                       eventBus.post(new KickedFromChannel(this, parameters.get(0), reply.source().get(), parameters.get(1), getOptional(parameters, 2)));
+
                                /* okay, everything else. */
                                } else {
                                        eventBus.post(new UnknownReplyReceived(this, reply));
@@ -511,10 +520,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                        }
                        eventBus.post(new ConnectionClosed(this));
                } catch (IOException ioe1) {
-                       logger.log(Level.WARNING, "I/O error", ioe1);
+                       logger.warn("I/O error", ioe1);
                        eventBus.post(new ConnectionClosed(this, ioe1));
                } catch (RuntimeException re1) {
-                       logger.log(Level.SEVERE, "Runtime error", re1);
+                       logger.error("Runtime error", re1);
                        eventBus.post(new ConnectionClosed(this, re1));
                } finally {
                        established = false;
@@ -551,7 +560,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                if (inetAddress.isPresent() && port.isPresent()) {
                                        eventBus.post(new DccSendReceived(this, client, messageWords[2], inetAddress.get(), port.get(), fileSize));
                                } else {
-                                       logger.warning(String.format("Received malformed DCC SEND: “%s”", message));
+                                       logger.warn(String.format("Received malformed DCC SEND: “%s”", message));
                                }
                        } else if (messageWords[1].equalsIgnoreCase("ACCEPT")) {
                                Optional<Integer> port = Optional.fromNullable(Ints.tryParse(messageWords[3]));
@@ -559,7 +568,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                if (port.isPresent()) {
                                        eventBus.post(new DccAcceptReceived(this, client, messageWords[2], port.get(), position));
                                } else {
-                                       logger.warning(String.format("Received malformed DCC ACCEPT: “%s”", message));
+                                       logger.warn(String.format("Received malformed DCC ACCEPT: “%s”", message));
                                }
                        }
                }
@@ -713,7 +722,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                commandBuilder.append(parameter);
                        }
 
-                       logger.finest(String.format(">> %s", commandBuilder));
+                       logger.trace(String.format(">> %s", commandBuilder));
                        outputStream.write((commandBuilder.toString() + "\r\n").getBytes("UTF-8"));
                        outputStream.flush();
                }
@@ -744,6 +753,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                public void close() throws IOException {
                        Closeables.close(outputStream, true);
                        Closeables.close(inputStreamReader, true);
+                       Closeables.close(inputStream, true);
                }
 
        }