package net.pterodactylus.xdcc.core;
import static java.lang.String.format;
+import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
+import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
import static net.pterodactylus.xdcc.data.Download.FILTER_RUNNING;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import net.pterodactylus.irc.Connection;
import net.pterodactylus.irc.ConnectionBuilder;
import net.pterodactylus.xdcc.core.event.MessageReceived;
import net.pterodactylus.xdcc.data.Bot;
import net.pterodactylus.xdcc.data.Channel;
+import net.pterodactylus.xdcc.data.ConnectedNetwork;
import net.pterodactylus.xdcc.data.Download;
import net.pterodactylus.xdcc.data.Network;
import net.pterodactylus.xdcc.data.Pack;
import net.pterodactylus.xdcc.data.Server;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
/** The event bus. */
private final EventBus eventBus;
+ private final ChannelBanManager channelBanManager =
+ new ChannelBanManager();
/** The temporary directory to download files to. */
private final String temporaryDirectory;
*
* @return All connected networks
*/
- public Collection<Network> connectedNetworks() {
- return Lists.newArrayList(Optional.presentInstances(FluentIterable.from(networkConnections.values()).transform(new Function<Connection, Optional<Network>>() {
- @Override
- public Optional<Network> apply(Connection connection) {
- return getNetwork(connection);
- }
- })));
+ public Collection<ConnectedNetwork> connectedNetworks() {
+ 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).orElse(0);
+ return new ConnectedNetwork(network, entry.getValue().hostname(),
+ entry.getValue().port(), entry.getValue().nickname(),
+ channels.stream()
+ .filter((channel) -> channel.network()
+ .equals(network))
+ .map(Channel::name)
+ .collect(Collectors.<String>toList()),
+ extraChannels.stream()
+ .filter((channel) -> channel.network()
+ .equals(network))
+ .map(Channel::name)
+ .collect(Collectors.<String>toList()),
+ bots.size(), packCount);
+ }).collect(Collectors.<ConnectedNetwork>toList());
}
/**
continue;
}
+ /* are we banned from this channel? */
+ if (channelBanManager.isBanned(channel)) {
+ continue;
+ }
+
connectNetwork(channel.network());
Connection connection = networkConnections.get(channel.network());
if (connection.established()) {
if (!network.isPresent()) {
return;
}
+ if (!connection.established()) {
+ return;
+ }
/* find all channels that need to be removed. */
for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
return;
}
+ channelBanManager.unban(channel.get());
joinedChannels.add(channel.get());
logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name()));
}
return;
}
+ Optional<Channel> channel = getChannel(network.get(), channelNotJoined.channel());
+ if (!channel.isPresent()) {
+ eventBus.post(new GenericMessage(format("Could not join %s but didn’t try to join, either.", channel.get())));
+ return;
+ }
+
+ if (channelNotJoined.reason() == registeredNicknamesOnly) {
+ channels.remove(channel.get());
+ eventBus.post(new GenericMessage(
+ format("Not trying to join %s anymore.", channel.get())));
+ return;
+ }
+ if (channelNotJoined.reason() == banned) {
+ channelBanManager.ban(channel.get());
+ eventBus.post(new GenericMessage(
+ format("Banned from %s, suspending join for a day.",
+ channel.get())));
+ return;
+ }
+
eventBus.post(new GenericMessage(
- format("Could not join %s/%s: %s", channelNotJoined.channel(),
- network.get(), channelNotJoined.reason())));
+ format("Could not join %s: %s", channelNotJoined.channel(),
+ channelNotJoined.reason())));
}
/**
channels.remove(channel.get());
}
eventBus.post(new GenericMessage(format(
- "Kicked from %s/%s by %s: %s",
- kickedFromChannel.channel(), network.get(),
+ "Kicked from %s by %s: %s",
+ kickedFromChannel.channel(),
kickedFromChannel.kicker(),
kickedFromChannel.reason().or("<unknown>")
)));
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 {