Move topic handling into the simple command handler.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Oct 2014 19:52:17 +0000 (21:52 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Oct 2014 19:52:17 +0000 (21:52 +0200)
src/main/java/net/pterodactylus/irc/Connection.java

index 5345294..0b23305 100644 (file)
@@ -378,7 +378,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                                                                        s.get(), p.get(0)))
                                                        .addCommand("JOIN",
                                                                        (s, p) -> new ChannelJoined(this,
-                                                                                       p.get(0), s.get())),
+                                                                                       p.get(0), s.get()))
+                                                       .addCommand("332",
+                                                                       (s, p) -> new ChannelTopic(this, p.get(1),
+                                                                                       p.get(2))),
                                        new MotdHandler(eventBus, this),
                                        new ChannelNotJoinedHandler(eventBus, this),
                                        new ConnectionEstablishHandler(eventBus, this),
@@ -411,8 +414,6 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                /* channel stuff. */
                                } else if (command.equals("331")) {
                                        /* no topic is set. */
-                               } else if (command.equals("332")) {
-                                       eventBus.post(new ChannelTopic(this, parameters.get(1), parameters.get(2)));
                                } else if (command.equalsIgnoreCase("PART")) {
                                        eventBus.post(new ChannelLeft(this, parameters.get(0), reply.source().get(), getOptional(parameters, 1)));
                                } else if (command.equalsIgnoreCase("QUIT")) {