X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=ab9804afa304be71da49431ecc3e688af34cefa5;hb=8593a0995d655bebada567ab98a9de2cdf078243;hp=d4e51558e3788838326e92f5721639ab1325875d;hpb=a1ad62aece998bef7d62cab8fa31a839d1d16ef8;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 d4e5155..ab9804a 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import net.pterodactylus.irc.Connection;
-import net.pterodactylus.irc.ConnectionBuilder;
+import net.pterodactylus.irc.ConnectionFactory;
 import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
@@ -106,6 +106,7 @@ public class Core extends AbstractExecutionThreadService {
 
 	/** The event bus. */
 	private final EventBus eventBus;
+	private final ConnectionFactory connectionFactory;
 	private final ChannelBanManager channelBanManager =
 			new ChannelBanManager();
 
@@ -147,8 +148,9 @@ public class Core extends AbstractExecutionThreadService {
 	 * 		The directory to move finished files to
 	 */
 	@Inject
-	public Core(EventBus eventBus, String temporaryDirectory, String finalDirectory) {
+	public Core(EventBus eventBus, ConnectionFactory connectionFactory, String temporaryDirectory, String finalDirectory) {
 		this.eventBus = eventBus;
+		this.connectionFactory = connectionFactory;
 		this.temporaryDirectory = temporaryDirectory;
 		this.finalDirectory = finalDirectory;
 	}
@@ -428,7 +430,7 @@ public class Core extends AbstractExecutionThreadService {
 				return;
 			}
 			Server server = servers.get((int) (Math.random() * servers.size()));
-			Connection connection = new ConnectionBuilder(eventBus).connect(server.hostname()).port(server.unencryptedPorts().iterator().next()).build();
+			Connection connection = connectionFactory.createConnection(server.hostname(), server.unencryptedPorts().iterator().next());
 			connection.username(RandomNickname.get()).realName(RandomNickname.get());
 			networkConnections.put(network, connection);
 			connection.start();
@@ -577,6 +579,16 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
+		/* remove all bots for this channel, we might have been kicked. */
+		Collection<Bot> botsToRemove = networkBots.row(network.get())
+				.values().stream()
+				.filter(bot -> bot.channel()
+						.equalsIgnoreCase(channel.get().name()))
+				.collect(Collectors.toSet());
+		botsToRemove.stream()
+				.forEach(bot -> networkBots.row(network.get())
+						.remove(bot.name()));
+
 		if (channelNotJoined.reason() == registeredNicknamesOnly) {
 			channels.remove(channel.get());
 			eventBus.post(new GenericMessage(