From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 22 Oct 2014 19:52:17 +0000 (+0200)
Subject: Move topic handling into the simple command handler.
X-Git-Url: https://git.pterodactylus.net/?p=xudocci.git;a=commitdiff_plain;h=fb32712c6918214283285a99e2171ab282ab6a38

Move topic handling into the simple command handler.
---

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index 5345294..0b23305 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -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")) {