Remove channel we’re kicked from from the correct collection.

[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 272076c..30da4a8 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -39,8 +39,9 @@ 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.DefaultConnection;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
@@ -104,8 +105,10 @@ public class Core extends AbstractExecutionThreadService {
        /** The logger. */
        private static final Logger logger = Logger.getLogger(Core.class.getName());
 
+       private final Object syncObject = new Object();
        /** The event bus. */
        private final EventBus eventBus;
+       private final ConnectionFactory connectionFactory;
        private final ChannelBanManager channelBanManager =
                        new ChannelBanManager();
 
@@ -147,8 +150,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 +188,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()
@@ -373,10 +377,15 @@ public class Core extends AbstractExecutionThreadService {
        @Override
        protected void run() throws Exception {
                while (isRunning()) {
-                       try {
-                               Thread.sleep(TimeUnit.MINUTES.toMillis(1));
-                       } catch (InterruptedException ie1) {
-                               /* ignore. */
+                       synchronized (syncObject) {
+                               try {
+                                       syncObject.wait(TimeUnit.MINUTES.toMillis(1));
+                               } catch (InterruptedException ie1) {
+                                       /* ignore. */
+                               }
+                       }
+                       if (!isRunning()) {
+                               break;
                        }
 
                        /* find channels that should be monitored but are not. */
@@ -405,7 +414,10 @@ public class Core extends AbstractExecutionThreadService {
        }
 
        @Override
-       protected void shutDown() {
+       protected void triggerShutdown() {
+               synchronized (syncObject) {
+                       syncObject.notifyAll();
+               }
        }
 
        //
@@ -428,10 +440,11 @@ 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();
+                       connection.open();
                }
        }
 
@@ -577,6 +590,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(
@@ -654,9 +677,9 @@ public class Core extends AbstractExecutionThreadService {
                                        return;
                                }
 
-                               extraChannels.remove(channel);
+                               extraChannels.remove(channel.get());
                        } else {
-                               channels.remove(channel.get());
+                               joinedChannels.remove(channel.get());
                        }
                        eventBus.post(new GenericMessage(format(
                                        "Kicked from %s by %s: %s",
@@ -739,7 +762,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 {