X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=0e7495530ebff5efae4d7bc8c7107f1bcb69db35;hb=4c0282c38d7959ae8060a5603a8fa66eb6aa7fd7;hp=5b69add65632336a68962719b579b82ad34460c1;hpb=c590c35c873523a8278a2c9b6ee6369f3b60addb;p=xudocci.git diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java index 5b69add..0e74955 100644 --- a/src/main/java/net/pterodactylus/irc/Connection.java +++ b/src/main/java/net/pterodactylus/irc/Connection.java @@ -384,7 +384,14 @@ public class Connection extends AbstractExecutionThreadService implements Servic p.get(2))) .addCommand("PART", (s, p) -> new ChannelLeft(this, p.get(0), - s.get(), getOptional(p, 1))), + s.get(), getOptional(p, 1))) + .addCommand("QUIT", + (s, p) -> new ClientQuit(this, s.get(), + p.get(0))) + .addCommand("KICK", + (s, p) -> new KickedFromChannel(this, + p.get(0), s.get(), p.get(1), + getOptional(p, 2))), new MotdHandler(eventBus, this), new ChannelNotJoinedHandler(eventBus, this), new ConnectionEstablishHandler(eventBus, this), @@ -417,16 +424,11 @@ public class Connection extends AbstractExecutionThreadService implements Servic /* channel stuff. */ } else if (command.equals("331")) { /* no topic is set. */ - } else if (command.equalsIgnoreCase("QUIT")) { - eventBus.post(new ClientQuit(this, reply.source().get(), parameters.get(0))); /* basic connection housekeeping. */ } else if (command.equalsIgnoreCase("PING")) { connectionHandler.sendCommand("PONG", getOptional(parameters, 0), getOptional(parameters, 1)); - } else if (command.equalsIgnoreCase("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));