Skip to content
This repository has been archived by the owner on Jul 27, 2019. It is now read-only.

Commit

Permalink
Add bind option
Browse files Browse the repository at this point in the history
  • Loading branch information
@cnaude
cnaude committed Jun 13, 2014
1 parent 1766e67 commit 0f8a992
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 60 deletions.
113 changes: 61 additions & 52 deletions src/main/java/com/cnaude/purpleirc/PurpleBot.java
View file
Expand Up @@ -33,7 +33,11 @@
import com.nyancraft.reportrts.data.HelpRequest;
import com.titankingdoms.dev.titanchat.core.participant.Participant;
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.charset.Charset;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Achievement;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
Expand Down Expand Up @@ -72,6 +76,7 @@ public final class PurpleBot {
public int botServerPort;
public long chatDelay;
public String botServer;
public String bindAddress;
public String botNick;
public String botLogin;
public String botRealName;
Expand Down Expand Up @@ -129,41 +134,41 @@ public final class PurpleBot {
public PurpleBot(File file, PurpleIRC plugin) {
fileName = file.getName();
this.connected = false;
this.botChannels = new ArrayList<String>();
this.ircListeners = new ArrayList<ListenerAdapter>();
this.channelCmdNotifyRecipients = new ArrayList<String>();
this.commandMap = new CaseInsensitiveMap<CaseInsensitiveMap<CaseInsensitiveMap<String>>>();
this.enabledMessages = new CaseInsensitiveMap<Collection<String>>();
this.muteList = new CaseInsensitiveMap<Collection<String>>();
this.worldList = new CaseInsensitiveMap<Collection<String>>();
this.opsList = new CaseInsensitiveMap<Collection<String>>();
this.voicesList = new CaseInsensitiveMap<Collection<String>>();
this.heroChannel = new CaseInsensitiveMap<String>();
this.townyChannel = new CaseInsensitiveMap<String>();
this.invalidCommandCTCP = new CaseInsensitiveMap<Boolean>();
this.logIrcToHeroChat = new CaseInsensitiveMap<Boolean>();
this.shortify = new CaseInsensitiveMap<Boolean>();
this.invalidCommandPrivate = new CaseInsensitiveMap<Boolean>();
this.hideQuitWhenVanished = new CaseInsensitiveMap<Boolean>();
this.hideListWhenVanished = new CaseInsensitiveMap<Boolean>();
this.hideJoinWhenVanished = new CaseInsensitiveMap<Boolean>();
this.ignoreIRCChat = new CaseInsensitiveMap<Boolean>();
this.channelAutoJoin = new CaseInsensitiveMap<Boolean>();
this.channelTopicProtected = new CaseInsensitiveMap<Boolean>();
this.channelModes = new CaseInsensitiveMap<String>();
this.activeTopic = new CaseInsensitiveMap<String>();
this.channelTopic = new CaseInsensitiveMap<String>();
this.channelPassword = new CaseInsensitiveMap<String>();
this.tabIgnoreNicks = new CaseInsensitiveMap<Collection<String>>();
this.filters = new CaseInsensitiveMap<Collection<String>>();
this.channelNicks = new CaseInsensitiveMap<Collection<String>>();
this.channelTopicChanserv = new CaseInsensitiveMap<Boolean>();
this.joinMsg = new CaseInsensitiveMap<String>();
this.msgOnJoin = new CaseInsensitiveMap<Boolean>();
this.enableMessageFiltering = new CaseInsensitiveMap<Boolean>();
this.botChannels = new ArrayList<>();
this.ircListeners = new ArrayList<>();
this.channelCmdNotifyRecipients = new ArrayList<>();
this.commandMap = new CaseInsensitiveMap<>();
this.enabledMessages = new CaseInsensitiveMap<>();
this.muteList = new CaseInsensitiveMap<>();
this.worldList = new CaseInsensitiveMap<>();
this.opsList = new CaseInsensitiveMap<>();
this.voicesList = new CaseInsensitiveMap<>();
this.heroChannel = new CaseInsensitiveMap<>();
this.townyChannel = new CaseInsensitiveMap<>();
this.invalidCommandCTCP = new CaseInsensitiveMap<>();
this.logIrcToHeroChat = new CaseInsensitiveMap<>();
this.shortify = new CaseInsensitiveMap<>();
this.invalidCommandPrivate = new CaseInsensitiveMap<>();
this.hideQuitWhenVanished = new CaseInsensitiveMap<>();
this.hideListWhenVanished = new CaseInsensitiveMap<>();
this.hideJoinWhenVanished = new CaseInsensitiveMap<>();
this.ignoreIRCChat = new CaseInsensitiveMap<>();
this.channelAutoJoin = new CaseInsensitiveMap<>();
this.channelTopicProtected = new CaseInsensitiveMap<>();
this.channelModes = new CaseInsensitiveMap<>();
this.activeTopic = new CaseInsensitiveMap<>();
this.channelTopic = new CaseInsensitiveMap<>();
this.channelPassword = new CaseInsensitiveMap<>();
this.tabIgnoreNicks = new CaseInsensitiveMap<>();
this.filters = new CaseInsensitiveMap<>();
this.channelNicks = new CaseInsensitiveMap<>();
this.channelTopicChanserv = new CaseInsensitiveMap<>();
this.joinMsg = new CaseInsensitiveMap<>();
this.msgOnJoin = new CaseInsensitiveMap<>();
this.enableMessageFiltering = new CaseInsensitiveMap<>();
this.plugin = plugin;
this.file = file;
whoisSenders = new ArrayList<CommandSender>();
whoisSenders = new ArrayList<>();
config = new YamlConfiguration();
loadConfig();
addListeners();
Expand Down Expand Up @@ -213,6 +218,14 @@ public void buildBot() {
plugin.logInfo("Using default character set: " + Charset.defaultCharset());
}
}
if (!bindAddress.isEmpty()) {
plugin.logInfo("Binding to " + bindAddress);
try {
configBuilder.setLocalAddress(InetAddress.getByName(bindAddress));
} catch (UnknownHostException ex) {
plugin.logError(ex.getMessage());
}
}
Configuration configuration = configBuilder.buildConfiguration();
bot = new PircBotX(configuration);
if (autoConnect) {
Expand Down Expand Up @@ -345,10 +358,7 @@ public void run() {
try {
plugin.logInfo(connectMessage);
bot.startBot();
} catch (IOException ex) {
plugin.logError("Problem connecting to " + botServer + " => "
+ " as " + botNick + " [Error: " + ex.getMessage() + "]");
} catch (IrcException ex) {
} catch (IOException | IrcException ex) {
plugin.logError("Problem connecting to " + botServer + " => "
+ " as " + botNick + " [Error: " + ex.getMessage() + "]");
}
Expand Down Expand Up @@ -535,6 +545,7 @@ private void loadConfig() {
.getDescription().getWebsite();
}
botServer = config.getString("server", "");
bindAddress = config.getString("bind", "");
charSet = config.getString("charset", "");
sanitizeServerName();
showMOTD = config.getBoolean("show-motd", false);
Expand All @@ -548,6 +559,7 @@ private void loadConfig() {
plugin.logDebug("Nick => " + botNick);
plugin.logDebug("Login => " + botLogin);
plugin.logDebug("Server => " + botServer);
plugin.logDebug(("Bind => ") + bindAddress);
plugin.logDebug("SSL => " + ssl);
plugin.logDebug("Trust All Certs => " + trustAllCerts);
plugin.logDebug("Port => " + botServerPort);
Expand Down Expand Up @@ -645,7 +657,7 @@ private void loadConfig() {
plugin.logDebug(" EnableMessageFiltering => " + enableMessageFiltering.get(channelName));

// build channel op list
Collection<String> cOps = new ArrayList<String>();
Collection<String> cOps = new ArrayList<>();
for (String channelOper : config.getStringList("channels." + enChannelName + ".ops")) {
if (!cOps.contains(channelOper)) {
cOps.add(channelOper);
Expand All @@ -658,7 +670,7 @@ private void loadConfig() {
}

// build channel voice list
Collection<String> cVoices = new ArrayList<String>();
Collection<String> cVoices = new ArrayList<>();
for (String channelVoice : config.getStringList("channels." + enChannelName + ".voices")) {
if (!cVoices.contains(channelVoice)) {
cVoices.add(channelVoice);
Expand All @@ -671,7 +683,7 @@ private void loadConfig() {
}

// build mute list
Collection<String> m = new ArrayList<String>();
Collection<String> m = new ArrayList<>();
for (String mutedUser : config.getStringList("channels." + enChannelName + ".muted")) {
if (!m.contains(mutedUser)) {
m.add(mutedUser);
Expand All @@ -684,7 +696,7 @@ private void loadConfig() {
}

// build valid chat list
Collection<String> c = new ArrayList<String>();
Collection<String> c = new ArrayList<>();
for (String validChat : config.getStringList("channels." + enChannelName + ".enabled-messages")) {
if (!c.contains(validChat)) {
c.add(validChat);
Expand All @@ -697,7 +709,7 @@ private void loadConfig() {
}

// build valid world list
Collection<String> w = new ArrayList<String>();
Collection<String> w = new ArrayList<>();
for (String validWorld : config.getStringList("channels." + enChannelName + ".worlds")) {
if (!w.contains(validWorld)) {
w.add(validWorld);
Expand All @@ -710,7 +722,7 @@ private void loadConfig() {
}

// build valid world list
Collection<String> t = new ArrayList<String>();
Collection<String> t = new ArrayList<>();
for (String name : config.getStringList("channels." + enChannelName + ".custom-tab-ignore-list")) {
if (!t.contains(name)) {
t.add(name);
Expand All @@ -723,7 +735,7 @@ private void loadConfig() {
}

// build valid world list
Collection<String> f = new ArrayList<String>();
Collection<String> f = new ArrayList<>();
for (String word : config.getStringList("channels." + enChannelName + ".filter-list")) {
if (!f.contains(word)) {
f.add(word);
Expand All @@ -736,12 +748,11 @@ private void loadConfig() {
}

// build command map
CaseInsensitiveMap<CaseInsensitiveMap<String>> map
= new CaseInsensitiveMap<CaseInsensitiveMap<String>>();
CaseInsensitiveMap<CaseInsensitiveMap<String>> map = new CaseInsensitiveMap<>();
try {
for (String command : config.getConfigurationSection("channels." + enChannelName + ".commands").getKeys(false)) {
plugin.logDebug(" Command => " + command);
CaseInsensitiveMap<String> optionPair = new CaseInsensitiveMap<String>();
CaseInsensitiveMap<String> optionPair = new CaseInsensitiveMap<>();
String commandKey = "channels." + enChannelName + ".commands." + command + ".";
optionPair.put("modes", config.getString(commandKey + "modes", "*"));
optionPair.put("private", config.getString(commandKey + "private", "false"));
Expand All @@ -767,9 +778,7 @@ private void loadConfig() {
+ "\" [SSL: " + ssl + "]" + " [TrustAllCerts: "
+ trustAllCerts + "]";
}
} catch (IOException ex) {
plugin.logError(ex.getMessage());
} catch (InvalidConfigurationException ex) {
} catch (IOException | InvalidConfigurationException ex) {
plugin.logError(ex.getMessage());
}
}
Expand Down Expand Up @@ -1792,7 +1801,7 @@ public void sendUserList(CommandSender sender, Channel channel) {
sender.sendMessage(ChatColor.RED + " Not connected!");
return;
}
List<String> channelUsers = new ArrayList<String>();
List<String> channelUsers = new ArrayList<>();
for (User user : channel.getUsers()) {
String nick = user.getNick();
nick = getNickPrefix(user, channel) + nick;
Expand Down Expand Up @@ -1864,7 +1873,7 @@ public void updateNickList(Channel channel) {
return;
}
// Build current list of names in channel
ArrayList<String> users = new ArrayList<String>();
ArrayList<String> users = new ArrayList<>();
for (User user : channel.getUsers()) {
//plugin.logDebug("N: " + user.getNick());
users.add(user.getNick());
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/cnaude/purpleirc/PurpleIRC.java
View file
Expand Up @@ -1136,16 +1136,16 @@ public void saveDisplayNameCache() {

public void loadDisplayNameCache() {
try {
BufferedReader in = new BufferedReader(new FileReader(cacheFile));
String line;
while ((line = in.readLine()) != null) {
if (line.equals("\n")) {
continue;
try (BufferedReader in = new BufferedReader(new FileReader(cacheFile))) {
String line;
while ((line = in.readLine()) != null) {
if (line.equals("\n")) {
continue;
}
String[] parts = line.split("\t", 2);
updateDisplayNameCache(parts[0], parts[1]);
}
String[] parts = line.split("\t", 2);
updateDisplayNameCache(parts[0], parts[1]);
}
in.close();
} catch (IOException | NumberFormatException e) {
logError(e.getMessage());
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/SampleBot.yml
View file
Expand Up @@ -17,6 +17,8 @@ port: 6667
ssl: false
# Trust all SSL certs
trust-all-certs: false
# Bind address
bind: ''
# Auto split length for long messages
max-line-length: 440
# Character encoding. Leave blank for Java default.
Expand Down

0 comments on commit 0f8a992

Please sign in to comment.