Upstream
/
PurpleIRC-spigot
mirror of https://github.com/cnaude/PurpleIRC-spigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add channel to IRCMessageEvent

This commit is contained in:
cnaude 2017-04-03 19:47:46 -07:00
parent f05a74afcb
commit d07f6be1e2
7 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/cnaude/purpleirc/Events/IRCMessageEvent.java
View File

@ -29,16 +29,19 @@ public class IRCMessageEvent extends Event {
private static final HandlerList HANDLERS = new HandlerList();
private String message;
private final String channel;
private final String permission;
private final Player player;
/**
*
* @param message
* @param channel
* @param permission
*/
public IRCMessageEvent(String message, String permission) {
public IRCMessageEvent(String message, String channel, String permission) {
this.message = message;
this.channel = channel;
this.permission = permission;
this.player = null;
}
@ -46,11 +49,13 @@ public class IRCMessageEvent extends Event {
/**
*
* @param message
* @param channel
* @param permission
* @param player
*/
public IRCMessageEvent(String message, String permission, Player player) {
public IRCMessageEvent(String message, String channel, String permission, Player player) {
this.message = message;
this.channel = channel;
this.permission = permission;
this.player = player;
}

2
src/main/java/com/cnaude/purpleirc/Hooks/McMMOChatHook.java
View File

@ -51,7 +51,7 @@ public class McMMOChatHook {
plugin.logDebug("[mcMMOChatHook:sendAdminMessage]: " + message);
String chatPrefix = Config.getInstance().getAdminChatPrefix();
message = LocaleLoader.formatString(chatPrefix, sender) + " " + message;
plugin.broadcastToGame(message, "mcmmo.chat.adminchat");
plugin.broadcastToGame(message, "", "mcmmo.chat.adminchat");
}
}

2
src/main/java/com/cnaude/purpleirc/Hooks/VentureChatHook.java
View File

@ -48,7 +48,7 @@ public class VentureChatHook {
if (mcp != null) {
for (String listen : mcp.getListening()) {
if (listen.equalsIgnoreCase(channel)) {
plugin.broadcastToPlayer(player, message, "irc.message.chat");
plugin.broadcastToPlayer(message, channel, "irc.message.chat", player);
}
}
}

2
src/main/java/com/cnaude/purpleirc/IRCListeners/NickChangeListener.java
View File

@ -60,7 +60,7 @@ public class NickChangeListener extends ListenerAdapter {
if (channel != null) {
if (ircBot.enabledMessages.get(channelName).contains(TemplateName.IRC_NICK_CHANGE)) {
String message = plugin.tokenizer.ircNickChangeTokenizer(user, oldNick, newNick, channelName, ircBot);
plugin.broadcastToGame(message, "irc.message.nickchange");
plugin.broadcastToGame(message, channelName, "irc.message.nickchange");
}
if (plugin.netPackets != null) {
plugin.netPackets.remFromTabList(oldNick);

4
src/main/java/com/cnaude/purpleirc/IRCListeners/NoticeListener.java
View File

@ -73,11 +73,11 @@ public class NoticeListener extends ListenerAdapter {
ircBot.linkRequests.put(user.getNick(), code);
plugin.broadcastToGame(ChatColor.LIGHT_PURPLE
+ "PurpleIRC bot link request from "
+ ChatColor.WHITE + user.getNick(), "irc.link");
+ ChatColor.WHITE + user.getNick(), channel.getName(), "irc.link");
plugin.broadcastToGame(ChatColor.LIGHT_PURPLE + "To accept: "
+ ChatColor.WHITE + "/irc linkaccept "
+ ircBot.getFileName().replace(".yml", "")
+ " " + user.getNick(), "irc.link");
+ " " + user.getNick(), channel.getName(), "irc.link");
return;
}

24
src/main/java/com/cnaude/purpleirc/PurpleBot.java
View File

@ -2886,7 +2886,7 @@ public final class PurpleBot {
plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, plugin.getMessageTemplate(
botNick, channelName, TemplateName.IRC_CHAT), message), channelName);
if (!newMessage.isEmpty()) {
plugin.broadcastToGame(newMessage, getIrcMessagePermission(channelName, "chat"));
plugin.broadcastToGame(newMessage, channelName, getIrcMessagePermission(channelName, "chat"));
messageSent = true;
}
}
@ -2955,7 +2955,7 @@ public final class PurpleBot {
plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, plugin.getMessageTemplate(
botNick, channelName, TemplateName.IRC_ESS_HELPOP), message), channelName);
if (!newMessage.isEmpty()) {
plugin.broadcastToGame(newMessage, "essentials.helpop.receive");
plugin.broadcastToGame(newMessage, channelName, "essentials.helpop.receive");
messageSent = true;
}
}
@ -3177,7 +3177,8 @@ public final class PurpleBot {
if (isMessageEnabled(channelName, TemplateName.IRC_ACTION)) {
plugin.broadcastToGame(plugin.tokenizer.ircChatToGameTokenizer(
this, user, channel, plugin.getMessageTemplate(
botNick, channelName, TemplateName.IRC_ACTION), message), getIrcMessagePermission(channelName, "action"));
botNick, channelName, TemplateName.IRC_ACTION), message),
channelName, getIrcMessagePermission(channelName, "action"));
} else {
plugin.logDebug("Ignoring action due to "
+ TemplateName.IRC_ACTION + " is false");
@ -3244,6 +3245,7 @@ public final class PurpleBot {
plugin.broadcastToGame(plugin.tokenizer.ircKickTokenizer(
this, recipient, kicker, reason, channel, plugin.getMessageTemplate(
botNick, channelName, TemplateName.IRC_KICK)),
channelName,
getIrcMessagePermission(channelName, "kick"));
}
@ -3296,7 +3298,8 @@ public final class PurpleBot {
if (isMessageEnabled(channel, TemplateName.IRC_MODE)) {
plugin.broadcastToGame(plugin.tokenizer.ircModeTokenizer(this, user, mode,
channel, plugin.getMessageTemplate(
botNick, channelName, TemplateName.IRC_MODE)), getIrcMessagePermission(channelName, "mode"));
botNick, channelName, TemplateName.IRC_MODE)),
channelName, getIrcMessagePermission(channelName, "mode"));
}
}
@ -3312,7 +3315,8 @@ public final class PurpleBot {
if (isMessageEnabled(channel, TemplateName.IRC_NOTICE)) {
plugin.broadcastToGame(plugin.tokenizer.ircNoticeTokenizer(this, user,
message, notice, channel, plugin.getMessageTemplate(
botNick, channelName, TemplateName.IRC_NOTICE)), getIrcMessagePermission(channelName, "notice"));
botNick, channelName, TemplateName.IRC_NOTICE)),
channelName, getIrcMessagePermission(channelName, "notice"));
}
}
@ -3327,6 +3331,7 @@ public final class PurpleBot {
plugin.logDebug("[broadcastIRCJoin] Broadcasting join message because " + TemplateName.IRC_JOIN + " is true.");
plugin.broadcastToGame(plugin.tokenizer.chatIRCTokenizer(
this, user, channel, plugin.getMessageTemplate(botNick, channelName, TemplateName.IRC_JOIN)),
channelName,
getIrcMessagePermission(channelName, "join"));
} else {
plugin.logDebug("[broadcastIRCJoin] NOT broadcasting join message because irc-join is false.");
@ -3367,7 +3372,7 @@ public final class PurpleBot {
this, user, channel, plugin.getMessageTemplate(botNick, channelName, TemplateName.IRC_PART));
plugin.logDebug("[broadcastIRCPart] Broadcasting part message because "
+ TemplateName.IRC_PART + " is true: " + message);
plugin.broadcastToGame(message, getIrcMessagePermission(channelName, "part"));
plugin.broadcastToGame(message, channelName, getIrcMessagePermission(channelName, "part"));
} else {
plugin.logDebug("[broadcastIRCPart] NOT broadcasting part message because "
+ TemplateName.IRC_PART + " is false.");
@ -3406,7 +3411,7 @@ public final class PurpleBot {
+ TemplateName.IRC_QUIT + " is true.");
plugin.broadcastToGame(plugin.tokenizer.chatIRCTokenizer(
this, user, channel, plugin.getMessageTemplate(botNick, channelName, TemplateName.IRC_QUIT))
.replace("%REASON%", reason), getIrcMessagePermission(channelName, "quit"));
.replace("%REASON%", reason), channelName, getIrcMessagePermission(channelName, "quit"));
} else {
plugin.logDebug("[broadcastIRCQuit] NOT broadcasting quit message because "
+ TemplateName.IRC_QUIT + " is false.");
@ -3452,6 +3457,7 @@ public final class PurpleBot {
if (isMessageEnabled(channel, TemplateName.IRC_TOPIC)) {
plugin.broadcastToGame(plugin.tokenizer.chatIRCTokenizer(
this, user, channel, plugin.getMessageTemplate(botNick, channelName, TemplateName.IRC_TOPIC)),
channelName,
getIrcMessagePermission(channelName, "topic"));
}
@ -3520,7 +3526,7 @@ public final class PurpleBot {
* @param nick
*/
public void broadcastIRCDisconnect(String nick) {
plugin.broadcastToGame("[" + nick + "] Disconnected from IRC server.", "irc.message.disconnect");
plugin.broadcastToGame("[" + nick + "] Disconnected from IRC server.", "", "irc.message.disconnect");
}
/**
@ -3529,7 +3535,7 @@ public final class PurpleBot {
* @param nick
*/
public void broadcastIRCConnect(String nick) {
plugin.broadcastToGame("[" + nick + "] Connected to IRC server.", "irc.message.connect");
plugin.broadcastToGame("[" + nick + "] Connected to IRC server.", "", "irc.message.connect");
}
/**

8
src/main/java/com/cnaude/purpleirc/PurpleIRC.java
View File

@ -1806,12 +1806,12 @@ public class PurpleIRC extends JavaPlugin {
}
}
public void broadcastToGame(final String message, final String permission) {
getServer().getPluginManager().callEvent(new IRCMessageEvent(message, permission));
public void broadcastToGame(final String message, final String channel, final String permission) {
getServer().getPluginManager().callEvent(new IRCMessageEvent(message, channel, permission));
}
public void broadcastToPlayer(final Player player, final String message, final String permission) {
getServer().getPluginManager().callEvent(new IRCMessageEvent(message, permission, player));
public void broadcastToPlayer(final String message, final String channel, final String permission, final Player player) {
getServer().getPluginManager().callEvent(new IRCMessageEvent(message, channel, permission, player));
}
/**