Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2025-02-27 17:01:47 +01:00
Code Issues Projects Releases Wiki Activity

Add player list info to join/quit messages. #7

Browse Source
This commit is contained in:
cnaude 2015-10-22 07:23:30 -07:00
parent 3c71797184
commit 6202673298
6 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/cnaude/purpleirc/IRCMessageHandler.java
View File

@ -180,10 +180,9 @@ public class IRCMessageHandler {
case "@a": case "@a":
if (plugin.adminPrivateChatHook != null) { if (plugin.adminPrivateChatHook != null) {
String newMessage = ircBot.filterMessage( String newMessage = ircBot.filterMessage(
plugin.tokenizer.ircChatToGameTokenizer(ircBot, user, channel, plugin.getMsgTemplate( plugin.tokenizer.ircChatToGameTokenizer(ircBot, user, channel, plugin.getMsgTemplate(ircBot.botNick, channelName, TemplateName.IRC_ADMIN_CHAT), commandArgs), channelName);
ircBot.botNick, channelName, TemplateName.IRC_A_CHAT), commandArgs), channelName);
plugin.adminPrivateChatHook.sendMessage(newMessage, user.getNick()); plugin.adminPrivateChatHook.sendMessage(newMessage, user.getNick());
String acResponse = plugin.tokenizer.msgChatResponseTokenizer(target, commandArgs, plugin.getMsgTemplate(TemplateName.IRC_A_RESPONSE)); String acResponse = plugin.tokenizer.msgChatResponseTokenizer(target, commandArgs, plugin.getMsgTemplate(TemplateName.IRC_ADMIN_RESPONSE));
if (!acResponse.isEmpty()) { if (!acResponse.isEmpty()) {
sendMessage(ircBot, target, acResponse, ctcpResponse); sendMessage(ircBot, target, acResponse, ctcpResponse);
} }

11
src/main/java/com/cnaude/purpleirc/PlayerList.java Normal file
View File

@ -0,0 +1,11 @@
package com.cnaude.purpleirc;
/**
*
* @author cnaude
*/
public class PlayerList {
public int count;
public int max;
public String list;
}

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

@ -1350,10 +1350,10 @@ public final class PurpleBot {
return; return;
} }
for (String channelName : botChannels) { for (String channelName : botChannels) {
if (isMessageEnabled(channelName, TemplateName.GAME_A_CHAT)) { if (isMessageEnabled(channelName, TemplateName.GAME_ADMIN_CHAT)) {
asyncIRCMessage(channelName, plugin.tokenizer asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(name, plugin. .gameChatToIRCTokenizer(name, plugin.
getMsgTemplate(botNick, channelName, TemplateName.GAME_A_CHAT), message) getMsgTemplate(botNick, channelName, TemplateName.GAME_ADMIN_CHAT), message)
.replace("%WORLD%", world) .replace("%WORLD%", world)
); );
} }
@ -1564,7 +1564,7 @@ public final class PurpleBot {
if (isMessageEnabled(channelName, TemplateName.GAME_JOIN) if (isMessageEnabled(channelName, TemplateName.GAME_JOIN)
&& isPlayerInValidWorld(player, channelName)) { && isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin .gameChatToIRCTokenizer(this, channelName, player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_JOIN), message)); .getMsgTemplate(botNick, channelName, TemplateName.GAME_JOIN), message));
} }
} }
@ -1588,7 +1588,7 @@ public final class PurpleBot {
if (isMessageEnabled(channelName, TemplateName.GAME_QUIT) if (isMessageEnabled(channelName, TemplateName.GAME_QUIT)
&& isPlayerInValidWorld(player, channelName)) { && isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin .gameChatToIRCTokenizer(this, channelName, player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.GAME_QUIT), message)); .getMsgTemplate(botNick, channelName, TemplateName.GAME_QUIT), message));
} }
} }
@ -1607,7 +1607,7 @@ public final class PurpleBot {
if (isMessageEnabled(channelName, TemplateName.FAKE_JOIN) if (isMessageEnabled(channelName, TemplateName.FAKE_JOIN)
&& isPlayerInValidWorld(player, channelName)) { && isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin .gameChatToIRCTokenizer(this, channelName, player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.FAKE_JOIN), message)); .getMsgTemplate(botNick, channelName, TemplateName.FAKE_JOIN), message));
} }
} }
@ -1626,7 +1626,7 @@ public final class PurpleBot {
if (isMessageEnabled(channelName, TemplateName.FAKE_QUIT) if (isMessageEnabled(channelName, TemplateName.FAKE_QUIT)
&& isPlayerInValidWorld(player, channelName)) { && isPlayerInValidWorld(player, channelName)) {
asyncIRCMessage(channelName, plugin.tokenizer asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin .gameChatToIRCTokenizer(this, channelName, player, plugin
.getMsgTemplate(botNick, channelName, TemplateName.FAKE_QUIT), message)); .getMsgTemplate(botNick, channelName, TemplateName.FAKE_QUIT), message));
} }
} }
@ -2578,10 +2578,9 @@ public final class PurpleBot {
Send messages to AdminPrivateChat if enabled Send messages to AdminPrivateChat if enabled
*/ */
if (plugin.adminPrivateChatHook != null) { if (plugin.adminPrivateChatHook != null) {
if (isMessageEnabled(channelName, TemplateName.IRC_A_CHAT) || override) { if (isMessageEnabled(channelName, TemplateName.IRC_ADMIN_CHAT) || override) {
String newMessage = filterMessage( String newMessage = filterMessage(
plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, plugin.getMsgTemplate( plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, plugin.getMsgTemplate(botNick, channelName, TemplateName.IRC_ADMIN_CHAT), message), channelName);
botNick, channelName, TemplateName.IRC_A_CHAT), message), channelName);
if (!newMessage.isEmpty()) { if (!newMessage.isEmpty()) {
plugin.adminPrivateChatHook.sendMessage(newMessage, user.getNick()); plugin.adminPrivateChatHook.sendMessage(newMessage, user.getNick());
messageSent = true; messageSent = true;

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

@ -825,6 +825,25 @@ public class PurpleIRC extends JavaPlugin {
* @return * @return
*/ */
public String getMCPlayers(PurpleBot ircBot, String channelName) { public String getMCPlayers(PurpleBot ircBot, String channelName) {
PlayerList pl = getMCPlayerList(ircBot, channelName);
String msg = listFormat
.replace("%COUNT%", Integer.toString(pl.count))
.replace("%MAX%", Integer.toString(pl.max))
.replace("%PLAYERS%", pl.list);
return colorConverter.gameColorsToIrc(msg);
}
/**
*
* @param ircBot
* @param channelName
* @return
*/
public PlayerList getMCPlayerList(PurpleBot ircBot, String channelName) {
PlayerList pl = new PlayerList();
Map<String, String> playerList = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); Map<String, String> playerList = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (Player player : getServer().getOnlinePlayers()) { for (Player player : getServer().getOnlinePlayers()) {
if (ircBot.hideListWhenVanished.get(channelName)) { if (ircBot.hideListWhenVanished.get(channelName)) {
@ -849,12 +868,12 @@ public class PurpleIRC extends JavaPlugin {
pList = Joiner.on(listSeparator).join(playerList.values()); pList = Joiner.on(listSeparator).join(playerList.values());
} }
String msg = listFormat pl.count = playerList.size();
.replace("%COUNT%", Integer.toString(playerList.size())) pl.max = getServer().getMaxPlayers();
.replace("%MAX%", Integer.toString(getServer().getMaxPlayers())) pl.list = pList;
.replace("%PLAYERS%", pList);
logDebug("L: " + msg); return pl;
return colorConverter.gameColorsToIrc(msg);
} }
public String getRemotePlayers(String commandArgs) { public String getRemotePlayers(String commandArgs) {

6
src/main/java/com/cnaude/purpleirc/TemplateName.java
View File

@ -130,9 +130,9 @@ public class TemplateName {
public final static String REDDIT_MESSAGES = "reddit-messages"; public final static String REDDIT_MESSAGES = "reddit-messages";
public final static String IRC_A_RESPONSE = "irc-a-response"; public final static String IRC_ADMIN_RESPONSE = "irc-a-response";
public final static String GAME_A_CHAT = "game-a-chat"; public final static String GAME_ADMIN_CHAT = "game-a-chat";
public final static String IRC_A_CHAT = "irc-a-chat"; public final static String IRC_ADMIN_CHAT = "irc-a-chat";
public final static String FAKE_JOIN = "fake-join"; public final static String FAKE_JOIN = "fake-join";
public final static String FAKE_QUIT = "fake-quit"; public final static String FAKE_QUIT = "fake-quit";

25
src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
View File

@ -16,6 +16,7 @@
*/ */
package com.cnaude.purpleirc.Utilities; package com.cnaude.purpleirc.Utilities;
import com.cnaude.purpleirc.PlayerList;
import com.cnaude.purpleirc.PurpleBot; import com.cnaude.purpleirc.PurpleBot;
import com.cnaude.purpleirc.PurpleIRC; import com.cnaude.purpleirc.PurpleIRC;
import com.cnaude.purpleirc.TemplateName; import com.cnaude.purpleirc.TemplateName;
@ -370,7 +371,6 @@ public class ChatTokenizer {
* *
* @param player * @param player
* @param template * @param template
*
* @param message * @param message
* @return * @return
*/ */
@ -384,6 +384,29 @@ public class ChatTokenizer {
/** /**
* Game chat to IRC * Game chat to IRC
* *
* @param ircBot
* @param channelName
* @param player
* @param template
* @param message
* @return
*/
public String gameChatToIRCTokenizer(PurpleBot ircBot, String channelName, Player player, String template, String message) {
if (message == null) {
message = "";
}
PlayerList pl = plugin.getMCPlayerList(ircBot, channelName);
return plugin.colorConverter.gameColorsToIrc(playerTokenizer(player, template)
.replace("%MESSAGE%", message)
.replace("%COUNT%", Integer.toString(pl.count))
.replace("%MAX%", Integer.toString(pl.max))
.replace("%PLAYERS%", pl.list)
);
}
/**
* Dynmap web chat to IRC
*
* @param source * @param source
* @param name * @param name
* @param template * @param template