Store a bot’s channel.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 17 Nov 2014 06:00:19 +0000 (07:00 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 17 Nov 2014 06:00:19 +0000 (07:00 +0100)
src/main/java/net/pterodactylus/xdcc/core/Core.java
src/main/java/net/pterodactylus/xdcc/data/Bot.java

index b6fb400..d4e5155 100644 (file)
@@ -739,7 +739,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 {
index 96d91b6..211dde7 100644 (file)
@@ -35,6 +35,7 @@ public class Bot implements Iterable<Pack> {
 
        /** The network this bot is on. */
        private final Network network;
+       private final String channel;
 
        /** The packs this bot carries. */
        private final Map<String, Pack> packs = Maps.newHashMap();
@@ -42,16 +43,9 @@ public class Bot implements Iterable<Pack> {
        /** The current name of the bot. */
        private String name;
 
-       /**
-        * Creates a new bot.
-        *
-        * @param network
-        *              The network the bot is on
-        * @param name
-        *              The name of the bot
-        */
-       public Bot(Network network, String name) {
+       public Bot(Network network, String channel, String name) {
                this.network = checkNotNull(network, "network must not be null");
+               this.channel = checkNotNull(channel, "channel must not be null");
                this.name = checkNotNull(name, "name must not be null");
        }
 
@@ -68,6 +62,10 @@ public class Bot implements Iterable<Pack> {
                return network;
        }
 
+       public String channel() {
+               return channel;
+       }
+
        /**
         * Returns the current name of this bot.
         *