Use a connection factory instead of a connection builder.

[xudocci.git] / src / main / java / net / pterodactylus / xdcc / core / Core.java

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 10cb06d..ab9804a 100644 (file)
--- 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;
        }
@@ -184,7 +186,7 @@ public class Core extends AbstractExecutionThreadService {
                return networkConnections.entrySet().stream().map((entry) -> {
                        Network network = entry.getKey();
                        Collection<Bot> bots = networkBots.row(network).values();
-                       int packCount = bots.stream().mapToInt((bot) -> bot.packs().size()).reduce((a, b) -> a + b).getAsInt();
+                       int packCount = bots.stream().mapToInt((bot) -> bot.packs().size()).reduce((a, b) -> a + b).orElse(0);
                        return new ConnectedNetwork(network, entry.getValue().hostname(),
                                        entry.getValue().port(), entry.getValue().nickname(),
                                        channels.stream()
@@ -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(
@@ -586,7 +598,7 @@ public class Core extends AbstractExecutionThreadService {
                if (channelNotJoined.reason() == banned) {
                        channelBanManager.ban(channel.get());
                        eventBus.post(new GenericMessage(
-                                       format("Banned from %s, suspending join for  day.",
+                                       format("Banned from %s, suspending join for a day.",
                                                        channel.get())));
                        return;
                }
@@ -739,7 +751,8 @@ public class Core extends AbstractExecutionThreadService {
                Bot bot;
                synchronized (networkBots) {
                        if (!networkBots.contains(network.get(), channelMessageReceived.source().nick().get())) {
-                               bot = new Bot(network.get(), channelMessageReceived.source().nick().get());
+                               bot = new Bot(network.get(), channelMessageReceived.channel(),
+                                               channelMessageReceived.source().nick().get());
                                networkBots.put(network.get(), channelMessageReceived.source().nick().get(), bot);
                                eventBus.post(new BotAdded(bot));
                        } else {