Update database to log incoming bungee chat with proper server names.

This commit is contained in:
Aust1n46 2020-03-27 14:37:35 -04:00
parent 5e6988399c
commit 3f0df15bb2
4 changed files with 21 additions and 11 deletions

View File

@ -694,6 +694,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
ByteArrayOutputStream stream = new ByteArrayOutputStream(); ByteArrayOutputStream stream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(stream); DataOutputStream out = new DataOutputStream(stream);
if(subchannel.equals("Chat")) { if(subchannel.equals("Chat")) {
String server = msgin.readUTF();
String chatchannel = msgin.readUTF(); String chatchannel = msgin.readUTF();
String senderName = msgin.readUTF(); String senderName = msgin.readUTF();
UUID senderUUID = UUID.fromString(msgin.readUTF()); UUID senderUUID = UUID.fromString(msgin.readUTF());
@ -732,6 +733,14 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
}); });
Bukkit.getConsoleSender().sendMessage(consoleChat); Bukkit.getConsoleSender().sendMessage(consoleChat);
if(db != null) {
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime());
db.writeVentureChat(date, senderUUID.toString(), senderName, server, chatchannel, chat.replace("'", "''"), "Chat");
}
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
if(p.isListening(chatChannelObject.getName())) { if(p.isListening(chatChannelObject.getName())) {
if(!p.getBungeeToggle() && MineverseChatAPI.getOnlineMineverseChatPlayer(senderName) == null) { if(!p.getBungeeToggle() && MineverseChatAPI.getOnlineMineverseChatPlayer(senderName) == null) {

View File

@ -163,6 +163,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
String primaryGroup = in.readUTF(); String primaryGroup = in.readUTF();
String nickname = in.readUTF(); String nickname = in.readUTF();
out.writeUTF("Chat"); out.writeUTF("Chat");
out.writeUTF(ser.getInfo().getName());
out.writeUTF(chatchannel); out.writeUTF(chatchannel);
out.writeUTF(senderName); out.writeUTF(senderName);
out.writeUTF(senderUUID); out.writeUTF(senderUUID);

View File

@ -160,7 +160,7 @@ public class ChatListener implements Listener {
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime()); String date = formatter.format(currentDate.getTime());
plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), "Messaging_Component", chat.replace("'", "''"), "Chat"); plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", "Messaging_Component", chat.replace("'", "''"), "Chat");
} }
} }
return; return;
@ -196,7 +196,7 @@ public class ChatListener implements Listener {
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime()); String date = formatter.format(currentDate.getTime());
plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), "Party_Component", chat.replace("'", "''"), "Chat"); plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", "Party_Component", chat.replace("'", "''"), "Chat");
} }
return; return;
} }
@ -485,14 +485,14 @@ public class ChatListener implements Listener {
int hash = event.getHash(); int hash = event.getHash();
boolean bungee = event.isBungee(); boolean bungee = event.isBungee();
if(plugin.db != null) {
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime());
plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), channel.getName(), chat.replace("'", "''"), "Chat");
}
if(!bungee) { if(!bungee) {
if(plugin.db != null) {
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime());
plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", channel.getName(), chat.replace("'", "''"), "Chat");
}
if(recipientCount == 1) { if(recipientCount == 1) {
if(!plugin.getConfig().getString("emptychannelalert", "&6No one is listening to you.").equals("")) { if(!plugin.getConfig().getString("emptychannelalert", "&6No one is listening to you.").equals("")) {
mcp.getPlayer().sendMessage(Format.FormatStringAll(plugin.getConfig().getString("emptychannelalert", "&6No one is listening to you."))); mcp.getPlayer().sendMessage(Format.FormatStringAll(plugin.getConfig().getString("emptychannelalert", "&6No one is listening to you.")));

View File

@ -98,7 +98,7 @@ public class CommandListener implements CommandExecutor, Listener {
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime()); String date = formatter.format(currentDate.getTime());
plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), "Command_Component", event.getMessage().replace("'", "''"), "Command"); plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", "Command_Component", event.getMessage().replace("'", "''"), "Command");
} }
for(Alias a : aa.getAliases()) { for(Alias a : aa.getAliases()) {
@ -200,7 +200,7 @@ public class CommandListener implements CommandExecutor, Listener {
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(currentDate.getTime()); String date = formatter.format(currentDate.getTime());
plugin.db.writeVentureChat(date, "N/A", "Console", plugin.getServer().getName(), "Command_Component", event.getCommand().replace("'", "''") , "Command"); plugin.db.writeVentureChat(date, "N/A", "Console", "Local", "Command_Component", event.getCommand().replace("'", "''") , "Command");
} }
} }