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;
/** 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();
* 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;
}
@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. */
}
@Override
- protected void shutDown() {
+ protected void triggerShutdown() {
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
}
//
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();
}
}
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(
return;
}
- extraChannels.remove(channel);
+ extraChannels.remove(channel.get());
} else {
channels.remove(channel.get());
}
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 {