From: David ‘Bombe’ Roden Date: Mon, 17 Nov 2014 06:00:19 +0000 (+0100) Subject: Store a bot’s channel. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=a1ad62aece998bef7d62cab8fa31a839d1d16ef8;p=xudocci.git Store a bot’s channel. --- diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java index b6fb400..d4e5155 100644 --- a/src/main/java/net/pterodactylus/xdcc/core/Core.java +++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java @@ -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 { diff --git a/src/main/java/net/pterodactylus/xdcc/data/Bot.java b/src/main/java/net/pterodactylus/xdcc/data/Bot.java index 96d91b6..211dde7 100644 --- a/src/main/java/net/pterodactylus/xdcc/data/Bot.java +++ b/src/main/java/net/pterodactylus/xdcc/data/Bot.java @@ -35,6 +35,7 @@ public class Bot implements Iterable { /** The network this bot is on. */ private final Network network; + private final String channel; /** The packs this bot carries. */ private final Map packs = Maps.newHashMap(); @@ -42,16 +43,9 @@ public class Bot implements Iterable { /** 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 { return network; } + public String channel() { + return channel; + } + /** * Returns the current name of this bot. *