projects
/
xudocci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only try to re-join banned channels once a day.
[xudocci.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
xdcc
/
core
/
Core.java
diff --git
a/src/main/java/net/pterodactylus/xdcc/core/Core.java
b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index
1ea95a9
..
5bcccf3
100644
(file)
--- a/
src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/
src/main/java/net/pterodactylus/xdcc/core/Core.java
@@
-18,6
+18,9
@@
package net.pterodactylus.xdcc.core;
import static java.lang.String.format;
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.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
@@
-104,6
+107,8
@@
public class Core extends AbstractExecutionThreadService {
/** The event bus. */
private final EventBus eventBus;
/** The event bus. */
private final EventBus eventBus;
+ private final ChannelBanManager channelBanManager =
+ new ChannelBanManager();
/** The temporary directory to download files to. */
private final String temporaryDirectory;
/** The temporary directory to download files to. */
private final String temporaryDirectory;
@@
-369,6
+374,11
@@
public class Core extends AbstractExecutionThreadService {
continue;
}
continue;
}
+ /* are we banned from this channel? */
+ if (channelBanManager.isBanned(channel)) {
+ continue;
+ }
+
connectNetwork(channel.network());
Connection connection = networkConnections.get(channel.network());
if (connection.established()) {
connectNetwork(channel.network());
Connection connection = networkConnections.get(channel.network());
if (connection.established()) {
@@
-534,6
+544,7
@@
public class Core extends AbstractExecutionThreadService {
return;
}
return;
}
+ channelBanManager.unban(channel.get());
joinedChannels.add(channel.get());
logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name()));
}
joinedChannels.add(channel.get());
logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name()));
}
@@
-554,6
+565,13
@@
public class Core extends AbstractExecutionThreadService {
}
return;
}
}
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", channelNotJoined.channel(),
eventBus.post(new GenericMessage(
format("Could not join %s: %s", channelNotJoined.channel(),