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

Commit

Permalink
Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@cnaude
cnaude committed May 17, 2014
1 parent 3fdee30 commit bde627b
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 87 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/cnaude/purpleirc/Commands/AddOp.java
View file
Expand Up @@ -50,7 +50,7 @@ public void dispatch(CommandSender sender, String[] args) {
}
if (mask.split("[\\!\\@]", 3).length == 3) {
plugin.ircBots.get(bot).addOp(channelName, mask, sender);
plugin.ircBots.get(bot).opFriends(channelName);
plugin.ircBots.get(bot).opIrcUsers(channelName);
} else {
sender.sendMessage(ChatColor.RED + "Invalid user or mask: "
+ ChatColor.WHITE + mask);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cnaude/purpleirc/Commands/AddVoice.java
View file
Expand Up @@ -50,7 +50,7 @@ public void dispatch(CommandSender sender, String[] args) {
}
if (mask.split("[\\!\\@]", 3).length == 3) {
plugin.ircBots.get(bot).addVoice(channelName, mask, sender);
plugin.ircBots.get(bot).voiceFriends(channelName);
plugin.ircBots.get(bot).voiceIrcUsers(channelName);
} else {
sender.sendMessage(ChatColor.RED + "Invalid user or mask: "
+ ChatColor.WHITE + mask);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/cnaude/purpleirc/IRCListeners/JoinListener.java
View file
Expand Up @@ -52,8 +52,8 @@ public void onJoin(JoinEvent event) {
return;
}
ircBot.broadcastIRCJoin(user, channel);
ircBot.opFriends(channel, user);
ircBot.voiceFriends(channel, user);
ircBot.opIrcUser(channel, user);
ircBot.voiceIrcUser(channel, user);
if (user.getNick().equals(ircBot.botNick)) {
plugin.logInfo("Joining channel: " + channelName);
plugin.logDebug("Setting channel modes: " + channelName + " => "
Expand Down
143 changes: 60 additions & 83 deletions src/main/java/com/cnaude/purpleirc/PurpleBot.java
View file
Expand Up @@ -799,7 +799,8 @@ private boolean isPlayerInValidWorld(Player player, String channelName) {
return false;
}

/** Called from normal game chat listener
/**
* Called from normal game chat listener
*
* @param player
* @param message
Expand Down Expand Up @@ -1151,7 +1152,7 @@ public void gameBroadcast(Player player, String message) {
if (enabledMessages.get(channelName).contains("broadcast-message")) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin
.getMsgTemplate(botNick, "broadcast-message"),
.getMsgTemplate(botNick, "broadcast-message"),
ChatColor.translateAlternateColorCodes('&', message)));
}
}
Expand Down Expand Up @@ -1874,21 +1875,21 @@ public void updateNickList(Channel channel) {
*
* @param channel
*/
public void opFriends(Channel channel) {
public void opIrcUsers(Channel channel) {
for (User user : channel.getUsers()) {
opFriends(channel, user);
opIrcUser(channel, user);
}
}

/**
*
* @param channelName
*/
public void opFriends(String channelName) {
public void opIrcUsers(String channelName) {
Channel channel = getChannel(channelName);
if (channel != null) {
for (User user : channel.getUsers()) {
opFriends(channel, user);
opIrcUser(channel, user);
}
}
}
Expand All @@ -1897,63 +1898,64 @@ public void opFriends(String channelName) {
*
* @param channel
*/
public void voiceFriends(Channel channel) {
public void voiceIrcUsers(Channel channel) {
for (User user : channel.getUsers()) {
voiceFriends(channel, user);
voiceIrcUser(channel, user);
}
}

/**
*
* @param channelName
*/
public void voiceFriends(String channelName) {
public void voiceIrcUsers(String channelName) {
Channel channel = getChannel(channelName);
if (channel != null) {
for (User user : channel.getUsers()) {
voiceFriends(channel, user);
voiceIrcUser(channel, user);
}
}
}

/**
*
* @param user
* @param userMask
* @return
*/
public boolean checkUserMask(User user, String userMask) {
String mask[] = userMask.split("[\\!\\@]", 3);
if (mask.length == 3) {
String gUser = plugin.regexGlobber.createRegexFromGlob(mask[0]);
String gLogin = plugin.regexGlobber.createRegexFromGlob(mask[1]);
String gHost = plugin.regexGlobber.createRegexFromGlob(mask[2]);
return (user.getNick().matches(gUser)
&& user.getLogin().matches(gLogin)
&& user.getHostmask().matches(gHost));
}
return false;
}

/**
*
* @param channel
* @param user
*/
public void opFriends(Channel channel, User user) {
public void opIrcUser(Channel channel, User user) {
String channelName = channel.getName();
if (user.getNick().equals(botNick)) {
return;
}
String channelName = channel.getName();
for (String opsUser : opsList.get(channelName)) {
plugin.logDebug("OP => " + user);
//sender!*login@hostname
String mask[] = opsUser.split("[\\!\\@]", 3);
if (mask.length == 3) {
String gUser = plugin.regexGlobber.createRegexFromGlob(mask[0]);
String gLogin = plugin.regexGlobber.createRegexFromGlob(mask[1]);
String gHost = plugin.regexGlobber.createRegexFromGlob(mask[2]);
String sender = user.getNick();
String login = user.getLogin();
String hostname = user.getHostmask();
plugin.logDebug("Nick: " + sender + " =~ " + gUser + " = " + sender.matches(gUser));
plugin.logDebug("Name: " + login + " =~ " + gLogin + " = " + login.matches(gLogin));
plugin.logDebug("Hostname: " + hostname + " =~ " + gHost + " = " + hostname.matches(gHost));
if (sender.matches(gUser) && login.matches(gLogin) && hostname.matches(gHost)) {
if (!channel.getOps().contains(user)) {
plugin.logInfo("Giving operator status to " + sender + " on " + channelName);
channel.send().op(user);
} else {
plugin.logInfo("User " + sender + " is already an operator on " + channelName);
}
return;
} else {
plugin.logDebug("No match: " + sender + "!" + login + "@" + hostname + " != " + user);
}
} else {
plugin.logInfo("Invalid op mask: " + opsUser);
}
if (channel.getOps().contains(user)) {
plugin.logInfo("User " + user.getNick() + " is already an operator on " + channelName);
return;
}
for (String userMask : opsList.get(channelName)) {
if (checkUserMask(user, userMask)) {
plugin.logInfo("Giving operator status to " + user.getNick() + " on " + channelName);
channel.send().op(user);
break;
}
}
}

Expand All @@ -1962,39 +1964,21 @@ public void opFriends(Channel channel, User user) {
* @param channel
* @param user
*/
public void voiceFriends(Channel channel, User user) {
public void voiceIrcUser(Channel channel, User user) {
String channelName = channel.getName();
if (user.getNick().equals(botNick)) {
return;
}
String channelName = channel.getName();
for (String voicesUser : voicesList.get(channelName)) {
plugin.logDebug("VOICE => " + user);
//sender!*login@hostname
String mask[] = voicesUser.split("[\\!\\@]", 3);
if (mask.length == 3) {
String gUser = plugin.regexGlobber.createRegexFromGlob(mask[0]);
String gLogin = plugin.regexGlobber.createRegexFromGlob(mask[1]);
String gHost = plugin.regexGlobber.createRegexFromGlob(mask[2]);
String sender = user.getNick();
String login = user.getLogin();
String hostname = user.getHostmask();
plugin.logDebug("Nick: " + sender + " =~ " + gUser + " = " + sender.matches(gUser));
plugin.logDebug("Name: " + login + " =~ " + gLogin + " = " + login.matches(gLogin));
plugin.logDebug("Hostname: " + hostname + " =~ " + gHost + " = " + hostname.matches(gHost));
if (sender.matches(gUser) && login.matches(gLogin) && hostname.matches(gHost)) {
if (!channel.getVoices().contains(user)) {
plugin.logInfo("Giving voice status to " + sender + " on " + channelName);
channel.send().voice(user);
} else {
plugin.logInfo("User " + sender + " is already a voice on " + channelName);
}
return;
} else {
plugin.logDebug("No match: " + sender + "!" + login + "@" + hostname + " != " + user);
}
} else {
plugin.logInfo("Invalid voice mask: " + voicesUser);
}
if (channel.getVoices().contains(user)) {
plugin.logInfo("User " + user.getNick() + " is already a voice on " + channelName);
return;
}
for (String userMask : voicesList.get(channelName)) {
if (checkUserMask(user, userMask)) {
plugin.logInfo("Giving voice status to " + user.getNick() + " on " + channelName);
channel.send().voice(user);
break;
}
}
}

Expand Down Expand Up @@ -2330,23 +2314,17 @@ public void broadcastIRCJoin(User user, org.pircbotx.Channel channel) {
}
}

public void broadcastIRCPart(User user, org.pircbotx.Channel channel) {
plugin.logDebug("[broadcastIRCPart] A");
if (enabledMessages.get(channel.getName()).contains(TemplateName.IRC_PART)) {
plugin.logDebug("[broadcastIRCPart] B");
public void broadcastIRCPart(User user, org.pircbotx.Channel channel) {
if (enabledMessages.get(channel.getName()).contains(TemplateName.IRC_PART)) {
String message = plugin.tokenizer.chatIRCTokenizer(
this, user, channel, plugin.getMsgTemplate(botNick, TemplateName.IRC_PART));
plugin.logDebug("[broadcastIRCPart] C");
this, user, channel, plugin.getMsgTemplate(botNick, TemplateName.IRC_PART));
plugin.logDebug("[broadcastIRCPart] Broadcasting part message because "
+ TemplateName.IRC_PART + " is true: " + message);
plugin.logDebug("[broadcastIRCPart] D");
plugin.getServer().broadcast(message, "irc.message.part");
plugin.logDebug("[broadcastIRCPart] E");
+ TemplateName.IRC_PART + " is true: " + message);
plugin.getServer().broadcast(message, "irc.message.part");
} else {
plugin.logDebug("[broadcastIRCPart] NOT broadcasting part message because "
+ TemplateName.IRC_PART + " is false.");
}
plugin.logDebug("[broadcastIRCPart] F");
}

if (enabledMessages.get(channel.getName()).contains(TemplateName.IRC_HERO_PART)) {
Herochat.getChannelManager().getChannel(heroChannel.get(channel.getName()))
Expand All @@ -2359,7 +2337,6 @@ public void broadcastIRCPart(User user, org.pircbotx.Channel channel) {
}

public void broadcastIRCQuit(User user, org.pircbotx.Channel channel, String reason) {

if (enabledMessages.get(channel.getName()).contains(TemplateName.IRC_QUIT)) {
plugin.logDebug("[broadcastIRCQuit] Broadcasting quit message because "
+ TemplateName.IRC_QUIT + " is true.");
Expand Down

0 comments on commit bde627b

Please sign in to comment.