projects
/
xudocci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Optional from java.util, not Guava
[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
d39ee2b
..
bfad867
100644
(file)
--- a/
src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/
src/main/java/net/pterodactylus/xdcc/core/Core.java
@@
-503,9
+503,6
@@
public class Core extends AbstractExecutionThreadService {
return;
}
networkConnections.remove(network.get());
return;
}
networkConnections.remove(network.get());
- if (!connection.established()) {
- return;
- }
/* find all channels that need to be removed. */
for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
/* find all channels that need to be removed. */
for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
@@
-661,7
+658,8
@@
public class Core extends AbstractExecutionThreadService {
channelBanManager.ban(channel.get());
if (channelNotJoined.reason() == registeredNicknamesOnly) {
eventBus.post(new GenericMessage(
channelBanManager.ban(channel.get());
if (channelNotJoined.reason() == registeredNicknamesOnly) {
eventBus.post(new GenericMessage(
- format("Not trying to join %s anymore.", channel.get())));
+ format("%s requires nickname registration, suspending join for a day.",
+ channel.get())));
} else if (channelNotJoined.reason() == inviteOnly) {
eventBus.post(new GenericMessage(
format("%s is invite-only, suspending join for a day.",
} else if (channelNotJoined.reason() == inviteOnly) {
eventBus.post(new GenericMessage(
format("%s is invite-only, suspending join for a day.",
@@
-749,7
+747,7
@@
public class Core extends AbstractExecutionThreadService {
"Kicked from %s by %s: %s",
kickedFromChannel.channel(),
kickedFromChannel.kicker(),
"Kicked from %s by %s: %s",
kickedFromChannel.channel(),
kickedFromChannel.kicker(),
- kickedFromChannel.reason().or("<unknown>")
+ kickedFromChannel.reason().or
Else
("<unknown>")
)));
}
}
)));
}
}