X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=0cc829425ce2eca5805faf122448306ae2dee1f0;hb=7e12b9da7bb49b20e1dbc95de0d89b07d8cda0e4;hp=171683b9a71892438a3b8476080333776e5507c4;hpb=c45f3f052f1ade1291732bc92e14e6c741a564ff;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 171683b..0cc8294 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -41,6 +41,7 @@ import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
+import net.pterodactylus.irc.event.ChannelNotJoined;
 import net.pterodactylus.irc.event.ClientQuit;
 import net.pterodactylus.irc.event.ConnectionClosed;
 import net.pterodactylus.irc.event.ConnectionEstablished;
@@ -545,8 +546,8 @@ public class Core extends AbstractExecutionThreadService {
 		}
 
 		eventBus.post(new GenericMessage(
-				format("Could not join %s/%s: %s", channelNotJoined.channel(),
-						network.get(), channelNotJoined.reason())));
+				format("Could not join %s: %s", channelNotJoined.channel(),
+						channelNotJoined.reason())));
 	}
 
 	/**
@@ -598,9 +599,22 @@ public class Core extends AbstractExecutionThreadService {
 
 		/* have we been kicked? */
 		if (nicknameMatchesConnection(kickedFromChannel.connection(), kickedFromChannel.kickee())) {
+			Optional<Channel> channel = getChannel(network.get(), kickedFromChannel.channel());
+			if (!channel.isPresent()) {
+				/* maybe it was an extra channel? */
+				channel = getExtraChannel(network.get(), kickedFromChannel.channel());
+				if (!channel.isPresent()) {
+					/* okay, whatever. */
+					return;
+				}
+
+				extraChannels.remove(channel);
+			} else {
+				channels.remove(channel.get());
+			}
 			eventBus.post(new GenericMessage(format(
-					"Kicked from %s/%s by %s: %s",
-					kickedFromChannel.channel(), network.get(),
+					"Kicked from %s by %s: %s",
+					kickedFromChannel.channel(),
 					kickedFromChannel.kicker(),
 					kickedFromChannel.reason().or("<unknown>")
 			)));
@@ -716,7 +730,7 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
-		eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.reply().source().get(), network.get(), privateNoticeReceived.text())));
+		eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.source(), network.get(), privateNoticeReceived.text())));
 	}
 
 	/**