package net.pterodactylus.xdcc.core;
import static java.lang.String.format;
+import static java.lang.System.currentTimeMillis;
+import static java.util.concurrent.TimeUnit.HOURS;
+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 net.pterodactylus.irc.event.ChannelJoined;
import net.pterodactylus.irc.event.ChannelLeft;
import net.pterodactylus.irc.event.ChannelMessageReceived;
+import net.pterodactylus.irc.event.ChannelNotJoined;
import net.pterodactylus.irc.event.ClientQuit;
import net.pterodactylus.irc.event.ConnectionClosed;
import net.pterodactylus.irc.event.ConnectionEstablished;
/** The event bus. */
private final EventBus eventBus;
+ private final ChannelBanManager channelBanManager =
+ new ChannelBanManager();
/** The temporary directory to download files to. */
private final String temporaryDirectory;
continue;
}
+ /* are we banned from this channel? */
+ if (channelBanManager.isBanned(channel)) {
+ continue;
+ }
+
connectNetwork(channel.network());
Connection connection = networkConnections.get(channel.network());
if (connection.established()) {
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 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())));
}
/**
/* have we been kicked? */
if (nicknameMatchesConnection(kickedFromChannel.connection(), kickedFromChannel.kickee())) {
+ Optional<Channel> channel = getChannel(network.get(), kickedFromChannel.channel());
+ if (!channel.isPresent()) {
+ /* maybe it was an extra channel? */
+ channel = getExtraChannel(network.get(), kickedFromChannel.channel());
+ if (!channel.isPresent()) {
+ /* okay, whatever. */
+ return;
+ }
+
+ extraChannels.remove(channel);
+ } else {
+ 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>")
)));
return;
}
- eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.reply().source().get(), network.get(), privateNoticeReceived.text())));
+ eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.source(), network.get(), privateNoticeReceived.text())));
}
/**