package net.pterodactylus.xdcc.core;
+import static java.lang.String.format;
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;
import net.pterodactylus.irc.event.DccDownloadFailed;
import net.pterodactylus.irc.event.DccDownloadFinished;
import net.pterodactylus.irc.event.DccSendReceived;
+import net.pterodactylus.irc.event.KickedFromChannel;
import net.pterodactylus.irc.event.NicknameChanged;
import net.pterodactylus.irc.event.PrivateMessageReceived;
import net.pterodactylus.irc.event.PrivateNoticeReceived;
}
}
+ @Subscribe
+ public void channelNotJoined(ChannelNotJoined channelNotJoined) {
+ Optional<Network> network = getNetwork(channelNotJoined.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ eventBus.post(new GenericMessage(
+ format("Could not join %s: %s", channelNotJoined.channel(),
+ channelNotJoined.reason())));
+ }
+
/**
* Removes bots that leave a channel, or channels when it’s us that’s leaving.
*
networkBots.remove(network.get(), channelLeft.client().nick().get());
}
+ @Subscribe
+ public void kickedFromChannel(KickedFromChannel kickedFromChannel) {
+ Optional<Network> network = getNetwork(kickedFromChannel.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ /* 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 by %s: %s",
+ kickedFromChannel.channel(),
+ kickedFromChannel.kicker(),
+ kickedFromChannel.reason().or("<unknown>")
+ )));
+ }
+ }
+
+ private boolean nicknameMatchesConnection(Connection connection, String nickname) {
+ return connection.nickname().equalsIgnoreCase(nickname);
+ }
+
/**
* Removes a client (which may be a bot) from the table of known bots.
*
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())));
}
/**