From 4b79d6909f3e1d2ee5aac6bbcde9fa81ec21db06 Mon Sep 17 00:00:00 2001
From: len <40720638+destro174@users.noreply.github.com>
Date: Sat, 22 May 2021 20:34:32 +0200
Subject: [PATCH] Refactor
---
.../java/com/alttd/chat/config/Config.java | 5 ++
.../com/alttd/chat/managers/RegexManager.java | 7 +-
.../com/alttd/chat/objects/ChatFilter.java | 8 +-
.../java/com/alttd/chat/objects/ChatUser.java | 17 ++--
.../{ChatFilterType.java => FilterType.java} | 8 +-
.../main/java/com/alttd/chat/ChatPlugin.java | 1 +
.../com/alttd/chat/commands/GlobalChat.java | 37 --------
.../com/alttd/chat/handler/ChatHandler.java | 73 ----------------
.../alttd/chat/listeners/PluginMessage.java | 43 +++++++++-
.../java/com/alttd/chat/VelocityChat.java | 2 +
.../alttd/chat/commands/GlobalAdminChat.java | 2 +-
.../com/alttd/chat/commands/GlobalChat.java | 43 ++++++++++
.../alttd/chat/commands/GlobalChatToggle.java | 52 ++++++++++++
.../java/com/alttd/chat/commands/Message.java | 6 +-
.../com/alttd/chat/commands/SendMail.java | 49 +++++++++--
.../com/alttd/chat/config/ServerConfig.java | 4 +-
.../{api => events}/GlobalAdminChatEvent.java | 2 +-
.../{api => events}/PrivateMessageEvent.java | 2 +-
.../com/alttd/chat/handlers/ChatHandler.java | 85 +++++++++++++++++--
.../alttd/chat/handlers/ServerHandler.java | 5 +-
.../alttd/chat/listeners/ChatListener.java | 4 +-
.../chat/listeners/PluginMessageListener.java | 3 +-
22 files changed, 300 insertions(+), 158 deletions(-)
rename api/src/main/java/com/alttd/chat/objects/{ChatFilterType.java => FilterType.java} (60%)
delete mode 100644 galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java
create mode 100644 velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java
create mode 100644 velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java
rename velocity/src/main/java/com/alttd/chat/{api => events}/GlobalAdminChatEvent.java (93%)
rename velocity/src/main/java/com/alttd/chat/{api => events}/PrivateMessageEvent.java (97%)
diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java
index 0067411..873253d 100644
--- a/api/src/main/java/com/alttd/chat/config/Config.java
+++ b/api/src/main/java/com/alttd/chat/config/Config.java
@@ -184,9 +184,14 @@ public final class Config {
public static String GCFORMAT = " >to Global: ";
public static String GCPERMISSION = "proxy.globalchat";
+ public static List GCALIAS = new ArrayList<>();
+ public static String GCNOTENABLED = "You don't have global chat enabled.";
private static void globalChat() {
MESSAGERECIEVER = getString("commands.globalchat.format", MESSAGERECIEVER);
GCPERMISSION = getString("commands.globalchat.view-chat-permission", GCPERMISSION);
+ GCALIAS.clear();
+ GCALIAS = getList("commands.globalchat.alias", Lists.newArrayList("gc", "global"));
+ GCNOTENABLED = getString("commands.globalchat.not-enabled", GCNOTENABLED);
}
public static List GACECOMMANDALIASES = new ArrayList<>();
diff --git a/api/src/main/java/com/alttd/chat/managers/RegexManager.java b/api/src/main/java/com/alttd/chat/managers/RegexManager.java
index a750ab5..781642b 100644
--- a/api/src/main/java/com/alttd/chat/managers/RegexManager.java
+++ b/api/src/main/java/com/alttd/chat/managers/RegexManager.java
@@ -2,7 +2,7 @@ package com.alttd.chat.managers;
import com.alttd.chat.config.Config;
import com.alttd.chat.config.RegexConfig;
-import com.alttd.chat.objects.ChatFilterType;
+import com.alttd.chat.objects.FilterType;
import com.google.common.collect.Lists;
import ninja.leaping.configurate.ConfigurationNode;
@@ -12,6 +12,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+// TODO rebuild this class, All regexes go in a single list where we use the ChatFilter object and a matcher
public class RegexManager {
private static final HashMap> cancelRegex = new HashMap<>();
@@ -23,9 +24,9 @@ public class RegexManager {
// maiby a REGEXobject and a list would be better here?
for(ConfigurationNode node : Config.REGEXNODE.getChildrenMap().values()) {
RegexConfig regexConfig = new RegexConfig(node.getString());
- if (ChatFilterType.getType(regexConfig.TYPE) == ChatFilterType.BLOCK) {
+ if (FilterType.getType(regexConfig.TYPE) == FilterType.BLOCK) {
cancelRegex.put(Pattern.compile(regexConfig.REGEX), Lists.newArrayList(regexConfig.REPLACEMENT));
- } else if (ChatFilterType.getType(regexConfig.TYPE) == ChatFilterType.REPLACE) {
+ } else if (FilterType.getType(regexConfig.TYPE) == FilterType.REPLACE) {
replaceRegex.put(regexConfig.REGEX, regexConfig.REPLACEMENT);
}
}
diff --git a/api/src/main/java/com/alttd/chat/objects/ChatFilter.java b/api/src/main/java/com/alttd/chat/objects/ChatFilter.java
index c1a9117..b598bbb 100644
--- a/api/src/main/java/com/alttd/chat/objects/ChatFilter.java
+++ b/api/src/main/java/com/alttd/chat/objects/ChatFilter.java
@@ -3,15 +3,15 @@ package com.alttd.chat.objects;
public class ChatFilter {
private final String regex;
- private final ChatFilterType type;
+ private final FilterType type;
private String replacement = "";
- public ChatFilter(String regex, ChatFilterType type) {
+ public ChatFilter(String regex, FilterType type) {
this.regex = regex;
this.type = type;
}
- public ChatFilter(String regex, ChatFilterType type, String replacement) {
+ public ChatFilter(String regex, FilterType type, String replacement) {
this.regex = regex;
this.type = type;
this.replacement = replacement;
@@ -21,7 +21,7 @@ public class ChatFilter {
return regex;
}
- public ChatFilterType getType() {
+ public FilterType getType() {
return type;
}
diff --git a/api/src/main/java/com/alttd/chat/objects/ChatUser.java b/api/src/main/java/com/alttd/chat/objects/ChatUser.java
index 51fdfb1..4cdc456 100644
--- a/api/src/main/java/com/alttd/chat/objects/ChatUser.java
+++ b/api/src/main/java/com/alttd/chat/objects/ChatUser.java
@@ -20,9 +20,6 @@ public class ChatUser {
private LinkedList mails;
- /**
- * Not all of the objects are relevant to proxy or server, so the saving should only update if the value has been changed?
- */
public ChatUser(UUID uuid, int partyId, boolean toggled_chat, boolean force_tp, boolean toggle_Gc) {
this.uuid = uuid;
this.partyId = partyId;
@@ -37,9 +34,9 @@ public class ChatUser {
prefix = Utility.getPrefix(uuid, true);
staffPrefix = Utility.getStaffPrefix(uuid);
- prefixAll = prefix + staffPrefix; //TODO test what this does cus I barely understand lp api
- // a boolean is lighter then a permission check, it's what I'd suggest doing here
- toggleGc = toggle_Gc;//Utility.checkPermission(uuid, "chat.gc"); //TODO put the actual permission here, I don't know what it is...
+ prefixAll = Utility.getPrefix(uuid, false);
+
+ toggleGc = toggle_Gc;
replyTarget = null;
mails = new LinkedList<>(); // todo load mails
}
@@ -58,7 +55,7 @@ public class ChatUser {
public void togglePartyChat() {
toggledPartyChat = !toggledPartyChat;
- Queries.setPartyChatState(toggledPartyChat, uuid); //TODO: Async pls
+ Queries.setPartyChatState(toggledPartyChat, uuid); //TODO: Async pls - no CompleteableFuture<>!
}
public boolean ForceTp() {
@@ -67,7 +64,7 @@ public class ChatUser {
public void toggleForceTp() {
forceTp = !forceTp;
- Queries.setForceTpState(forceTp, uuid); //TODO: Async pls
+ Queries.setForceTpState(forceTp, uuid); //TODO: Async pls - no CompleteableFuture<>!
}
public String getDisplayName() {
@@ -121,4 +118,8 @@ public class ChatUser {
public LinkedList getMails() {
return mails;
}
+
+ public void addMail(Mail mail) {
+ mails.add(mail);
+ }
}
diff --git a/api/src/main/java/com/alttd/chat/objects/ChatFilterType.java b/api/src/main/java/com/alttd/chat/objects/FilterType.java
similarity index 60%
rename from api/src/main/java/com/alttd/chat/objects/ChatFilterType.java
rename to api/src/main/java/com/alttd/chat/objects/FilterType.java
index f262bc8..1740d39 100644
--- a/api/src/main/java/com/alttd/chat/objects/ChatFilterType.java
+++ b/api/src/main/java/com/alttd/chat/objects/FilterType.java
@@ -1,17 +1,17 @@
package com.alttd.chat.objects;
-public enum ChatFilterType {
+public enum FilterType {
REPLACE("replace"),
BLOCK("block");
private final String name;
- ChatFilterType(String name) {
+ FilterType(String name) {
this.name = name;
}
- public static ChatFilterType getType(String name) {
- for (ChatFilterType type : ChatFilterType.values()) {
+ public static FilterType getType(String name) {
+ for (FilterType type : FilterType.values()) {
if (type.name.equalsIgnoreCase(name)) {
return type;
}
diff --git a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
index a9992f9..09a15cc 100644
--- a/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
+++ b/galaxy/src/main/java/com/alttd/chat/ChatPlugin.java
@@ -10,6 +10,7 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin;
+// Todo this is only needed to get some special usecases eg [i] -> get and return the item the player is holding over a SYNCRONIZED connection:/
public class ChatPlugin extends JavaPlugin {
private static ChatPlugin instance;
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java b/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java
deleted file mode 100644
index 209fc72..0000000
--- a/galaxy/src/main/java/com/alttd/chat/commands/GlobalChat.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.alttd.chat.commands;
-
-import com.alttd.chat.ChatPlugin;
-import com.alttd.chat.managers.ChatUserManager;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.util.Objects;
-
-public class GlobalChat implements CommandExecutor {
-
- @Override
- public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
- if(!(sender instanceof Player)) { // must be a player
- return true;
- }
- Player player = (Player) sender;
- if(args.length == 0) return false;
- if(args[0].equalsIgnoreCase("togglegc")) {
- new BukkitRunnable() {
- @Override
- public void run() {
- Objects.requireNonNull(ChatUserManager.getChatUser(((Player) sender).getUniqueId())).toggleGc();
- }
- }.runTask(ChatPlugin.getInstance());
- }
-
- String message = StringUtils.join(args, " ", 0, args.length);
- ChatPlugin.getInstance().getChatHandler().globalChat(player, message);
- return false;
- }
-
-}
diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
index 231a665..8ce9b77 100644
--- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
@@ -27,80 +27,7 @@ public class ChatHandler {
plugin = ChatPlugin.getInstance();
}
- public void globalChat(Player player, String message) {
- ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
- if(user == null) return;
- if(!user.isGcOn()) {
- player.sendMessage();// GC IS OFF INFORM THEM ABOUT THIS and cancel
- return;
- }
- // Check if the player has global chat enabled, if not warn them
- String senderName, prefix = "";
- senderName = player.getDisplayName(); // TODO this can be a component
- // can also be cached in the chatuser object?
- prefix = plugin.getChatAPI().getPrefix(player.getUniqueId());
- MiniMessage miniMessage = MiniMessage.get();
- message = Utility.parseColors(message);
- if(!player.hasPermission("chat.format"))
- message = miniMessage.stripTokens(message);
- if(message.contains("[i]"))
- message = message.replace("[i]", "<[i]>");
- List templates = new ArrayList<>(List.of(
- Template.of("sender", senderName),
- Template.of("prefix", prefix),
- Template.of("message", message),
- Template.of("server", Bukkit.getServerName())/*,
- Template.of("[i]", itemComponent(sender.getInventory().getItemInMainHand()))*/));
-
- Component component = miniMessage.parse(Config.GCFORMAT, templates);
-
- //todo make a method for this, it'll be used more then onc
-
- ByteArrayDataOutput out = ByteStreams.newDataOutput();
- out.writeUTF("globalchat");
- out.writeUTF(miniMessage.serialize(component));
- player.sendPluginMessage(plugin, Config.MESSAGECHANNEL, out.toByteArray());
- }
-
- // Start - move these to util
- public Component itemComponent(ItemStack item) {
- Component component = Component.text("[i]");
- if(item.getType().equals(Material.AIR))
- return component;
- boolean dname = item.hasItemMeta() && item.getItemMeta().hasDisplayName();
- if(dname) {
- component = component.append(item.getItemMeta().displayName());
- } else {
- component = Component.text(materialToName(item.getType()));
- }
- component = component.hoverEvent(item.asHoverEvent());
- return component;
- }
-
- private static String materialToName(Material m) {
- if (m.equals(Material.TNT)) {
- return "TNT";
- }
- String orig = m.toString().toLowerCase();
- String[] splits = orig.split("_");
- StringBuilder sb = new StringBuilder(orig.length());
- int pos = 0;
- for (String split : splits) {
- sb.append(split);
- int loc = sb.lastIndexOf(split);
- char charLoc = sb.charAt(loc);
- if (!(split.equalsIgnoreCase("of") || split.equalsIgnoreCase("and") ||
- split.equalsIgnoreCase("with") || split.equalsIgnoreCase("on")))
- sb.setCharAt(loc, Character.toUpperCase(charLoc));
- if (pos != splits.length - 1)
- sb.append(' ');
- ++pos;
- }
-
- return sb.toString();
- }
- // end - move these to util
}
diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java b/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java
index 1650b6d..969131f 100644
--- a/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java
+++ b/galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java
@@ -22,4 +22,45 @@ public class PluginMessage implements PluginMessageListener {
break;
}
}
-}
+
+/* // todo implement AdvancedChatFilter for this like this
+ // send pluginmessage to backend server and return a shatteredcomponent to be reparsed by proxy
+ // Start - move these to util
+ public Component itemComponent(ItemStack item) {
+ Component component = Component.text("[i]");
+ if(item.getType().equals(Material.AIR))
+ return component;
+ boolean dname = item.hasItemMeta() && item.getItemMeta().hasDisplayName();
+ if(dname) {
+ component = component.append(item.getItemMeta().displayName());
+ } else {
+ component = Component.text(materialToName(item.getType()));
+ }
+ component = component.hoverEvent(item.asHoverEvent());
+ return component;
+ }
+
+ private static String materialToName(Material m) {
+ if (m.equals(Material.TNT)) {
+ return "TNT";
+ }
+ String orig = m.toString().toLowerCase();
+ String[] splits = orig.split("_");
+ StringBuilder sb = new StringBuilder(orig.length());
+ int pos = 0;
+ for (String split : splits) {
+ sb.append(split);
+ int loc = sb.lastIndexOf(split);
+ char charLoc = sb.charAt(loc);
+ if (!(split.equalsIgnoreCase("of") || split.equalsIgnoreCase("and") ||
+ split.equalsIgnoreCase("with") || split.equalsIgnoreCase("on")))
+ sb.setCharAt(loc, Character.toUpperCase(charLoc));
+ if (pos != splits.length - 1)
+ sb.append(' ');
+ ++pos;
+ }
+
+ return sb.toString();
+ }
+ // end - move these to util
+}*/
diff --git a/velocity/src/main/java/com/alttd/chat/VelocityChat.java b/velocity/src/main/java/com/alttd/chat/VelocityChat.java
index 0616bee..91cec92 100644
--- a/velocity/src/main/java/com/alttd/chat/VelocityChat.java
+++ b/velocity/src/main/java/com/alttd/chat/VelocityChat.java
@@ -1,6 +1,7 @@
package com.alttd.chat;
import com.alttd.chat.commands.GlobalAdminChat;
+import com.alttd.chat.commands.GlobalChat;
import com.alttd.chat.config.Config;
import com.alttd.chat.handlers.ChatHandler;
import com.alttd.chat.handlers.ServerHandler;
@@ -83,6 +84,7 @@ public class VelocityChat {
public void loadCommands() {
new GlobalAdminChat(server);
+ new GlobalChat(server);
// all (proxy)commands go here
}
diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java
index eda966f..1ed8519 100644
--- a/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java
+++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalAdminChat.java
@@ -1,6 +1,6 @@
package com.alttd.chat.commands;
-import com.alttd.chat.api.GlobalAdminChatEvent;
+import com.alttd.chat.events.GlobalAdminChatEvent;
import com.alttd.chat.config.Config;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java
new file mode 100644
index 0000000..71e9fa2
--- /dev/null
+++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalChat.java
@@ -0,0 +1,43 @@
+package com.alttd.chat.commands;
+
+import com.alttd.chat.VelocityChat;
+import com.alttd.chat.config.Config;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import com.velocitypowered.api.command.BrigadierCommand;
+import com.velocitypowered.api.command.CommandMeta;
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ProxyServer;
+
+public class GlobalChat {
+
+ public GlobalChat(ProxyServer proxyServer) {
+ LiteralCommandNode command = LiteralArgumentBuilder
+ .literal("globalchat")
+ .requires(ctx -> ctx.hasPermission("command.proxy.globalchat"))// TODO permission system? load permissions from config?
+ .requires(ctx -> ctx instanceof Player) // players only can use this
+ .then(RequiredArgumentBuilder
+ .argument("message", StringArgumentType.greedyString())
+ .executes(context -> {
+ VelocityChat.getPlugin().getChatHandler().globalChat((Player) context.getSource(), context.getArgument("message", String.class));
+ return 1;
+ })
+ )
+ .executes(context -> 0) // todo info message /usage
+ .build();
+
+ BrigadierCommand brigadierCommand = new BrigadierCommand(command);
+
+ CommandMeta.Builder metaBuilder = proxyServer.getCommandManager().metaBuilder(brigadierCommand);
+
+ for (String alias : Config.GCALIAS) {
+ metaBuilder.aliases(alias);
+ }
+ CommandMeta meta = metaBuilder.build();
+
+ proxyServer.getCommandManager().register(meta, brigadierCommand);
+ }
+}
diff --git a/velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java b/velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java
new file mode 100644
index 0000000..e5c0051
--- /dev/null
+++ b/velocity/src/main/java/com/alttd/chat/commands/GlobalChatToggle.java
@@ -0,0 +1,52 @@
+package com.alttd.chat.commands;
+
+import com.alttd.chat.VelocityChat;
+import com.alttd.chat.config.Config;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import com.velocitypowered.api.command.BrigadierCommand;
+import com.velocitypowered.api.command.CommandMeta;
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ProxyServer;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.node.Node;
+
+public class GlobalChatToggle {
+
+ // todo q - can this be implemented in /gc toggle or /gc true/false
+ public GlobalChatToggle(ProxyServer proxyServer) {
+ LiteralCommandNode command = LiteralArgumentBuilder
+ .literal("toggleglobalchat")
+ .requires(ctx -> ctx instanceof Player)
+ .requires(ctx -> ctx.hasPermission("command.proxy.globalchat"))// TODO permission system? load permissions from config?
+ .then(RequiredArgumentBuilder
+ .argument("message", StringArgumentType.greedyString())
+ .executes(context -> {
+ LuckPerms luckPerms = VelocityChat.getPlugin().API().getLuckPerms();
+ Player player = (Player) context;
+ luckPerms.getUserManager().modifyUser(player.getUniqueId(), user -> {
+ if(player.hasPermission(Config.GCPERMISSION)) { //TODO THIS MUST BE A CONSTANT FROM CONFIG?
+ user.data().add(Node.builder(Config.GCPERMISSION).build());
+ } else {
+ user.data().remove(Node.builder(Config.GCPERMISSION).build());
+ }
+ });
+ return 1;
+ })
+ )
+ .executes(context -> 0)
+ .build();
+
+ BrigadierCommand brigadierCommand = new BrigadierCommand(command);
+
+ CommandMeta.Builder metaBuilder = proxyServer.getCommandManager().metaBuilder(brigadierCommand);
+ metaBuilder.aliases("togglegc");
+
+ CommandMeta meta = metaBuilder.build();
+
+ proxyServer.getCommandManager().register(meta, brigadierCommand);
+ }
+}
diff --git a/velocity/src/main/java/com/alttd/chat/commands/Message.java b/velocity/src/main/java/com/alttd/chat/commands/Message.java
index 2ab051b..3593ed2 100644
--- a/velocity/src/main/java/com/alttd/chat/commands/Message.java
+++ b/velocity/src/main/java/com/alttd/chat/commands/Message.java
@@ -1,7 +1,7 @@
package com.alttd.chat.commands;
import com.alttd.chat.VelocityChat;
-import com.alttd.chat.api.PrivateMessageEvent;
+import com.alttd.chat.events.PrivateMessageEvent;
import com.alttd.chat.config.Config;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -39,10 +39,8 @@ public class Message {
Player receiver = playerOptional.get();
proxyServer.getEventManager().fire(new PrivateMessageEvent(context.getSource(), receiver, context.getArgument("message", String.class))).thenAccept((event) -> {
if(event.getResult() == ResultedEvent.GenericResult.allowed()) {
- VelocityChat.getPlugin().getChatHandler().privateMessage(event);
+ VelocityChat.getPlugin().getChatHandler().privateMessage(context.getSource(), receiver, context.getArgument("message", String.class));
}
- // event has finished firing
- // do some logic dependent on the result
});
return 1;
} else {
diff --git a/velocity/src/main/java/com/alttd/chat/commands/SendMail.java b/velocity/src/main/java/com/alttd/chat/commands/SendMail.java
index 3830cdb..b3ca2d5 100644
--- a/velocity/src/main/java/com/alttd/chat/commands/SendMail.java
+++ b/velocity/src/main/java/com/alttd/chat/commands/SendMail.java
@@ -1,7 +1,6 @@
package com.alttd.chat.commands;
-import com.alttd.chat.api.GlobalAdminChatEvent;
-import com.alttd.chat.config.Config;
+import com.alttd.chat.VelocityChat;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.builder.RequiredArgumentBuilder;
@@ -27,7 +26,7 @@ public class SendMail {
.argument("player", StringArgumentType.string())
.suggests((context, builder) -> {
Collection possibleValues = new ArrayList<>();
- for (Player player : proxyServer.getAllPlayers()) {
+ for (Player player : proxyServer.getAllPlayers()) { // todo all chatplayers? this can be heavy
possibleValues.add(player.getGameProfile().getName());
}
if(possibleValues.isEmpty()) return Suggestions.empty();
@@ -43,13 +42,53 @@ public class SendMail {
.argument("message", StringArgumentType.greedyString())
.executes(context -> {
// todo construct the mail and notify the player if online?
+ VelocityChat.getPlugin().getChatHandler().sendMail();
return 1;
})
)
- .executes(context -> 0)
+ .executes(context -> {
+
+ return 1;
+ })
)
)
- .executes(context -> 0)
+ .then(LiteralArgumentBuilder.literal("list")
+ // TODO list read, unread, all?
+ .then(LiteralArgumentBuilder.literal("read")
+ .executes(context -> {
+
+ return 1;
+ })
+ )
+ .then(LiteralArgumentBuilder.literal("unread")
+ .executes(context -> {
+
+ return 1;
+ })
+ )
+ .then(LiteralArgumentBuilder.literal("all")
+ .executes(context -> {
+
+ return 1;
+ })
+ )
+ .executes(context -> {
+
+ return 1;
+ })
+ )
+ .then(LiteralArgumentBuilder.literal("admin")
+ .requires(ctx -> ctx.hasPermission("command.proxy.mail.admin"))// TODO permission system? load permissions from config?
+ // TODO admin command, remove, edit?
+ .executes(context -> {
+
+ return 1;
+ })
+ )
+ .executes(context -> {
+ // todo mail help message
+ return 1;
+ })
.build();
BrigadierCommand brigadierCommand = new BrigadierCommand(command);
diff --git a/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java b/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java
index 8705c54..9935bd2 100644
--- a/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java
+++ b/velocity/src/main/java/com/alttd/chat/config/ServerConfig.java
@@ -68,8 +68,8 @@ public final class ServerConfig {
/** DO NOT EDIT ANYTHING ABOVE **/
- public boolean GLOBALCHAT = true; // TODO change to false on release
- public boolean JOINLEAVEMSSAGES = true; // TODO change to false on release
+ public boolean GLOBALCHAT = true; // TODO - @teri idk what servers need to have this enabled
+ public boolean JOINLEAVEMSSAGES = true; // TODO set to false on lobby
private void ServerSettings() {
GLOBALCHAT = getBoolean("global-chat-enabled", GLOBALCHAT);
JOINLEAVEMSSAGES = getBoolean("joinleave-messages-enabled", JOINLEAVEMSSAGES);
diff --git a/velocity/src/main/java/com/alttd/chat/api/GlobalAdminChatEvent.java b/velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java
similarity index 93%
rename from velocity/src/main/java/com/alttd/chat/api/GlobalAdminChatEvent.java
rename to velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java
index b93e82c..1094f7b 100644
--- a/velocity/src/main/java/com/alttd/chat/api/GlobalAdminChatEvent.java
+++ b/velocity/src/main/java/com/alttd/chat/events/GlobalAdminChatEvent.java
@@ -1,4 +1,4 @@
-package com.alttd.chat.api;
+package com.alttd.chat.events;
import com.velocitypowered.api.command.CommandSource;
diff --git a/velocity/src/main/java/com/alttd/chat/api/PrivateMessageEvent.java b/velocity/src/main/java/com/alttd/chat/events/PrivateMessageEvent.java
similarity index 97%
rename from velocity/src/main/java/com/alttd/chat/api/PrivateMessageEvent.java
rename to velocity/src/main/java/com/alttd/chat/events/PrivateMessageEvent.java
index 8421403..37f6c6f 100644
--- a/velocity/src/main/java/com/alttd/chat/api/PrivateMessageEvent.java
+++ b/velocity/src/main/java/com/alttd/chat/events/PrivateMessageEvent.java
@@ -1,4 +1,4 @@
-package com.alttd.chat.api;
+package com.alttd.chat.events;
import com.velocitypowered.api.command.CommandSource;
diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
index 554b5f1..7a3a698 100644
--- a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
+++ b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
@@ -1,44 +1,111 @@
package com.alttd.chat.handlers;
-import com.alttd.chat.api.PrivateMessageEvent;
+import com.alttd.chat.VelocityChat;
+import com.alttd.chat.events.PrivateMessageEvent;
import com.alttd.chat.config.Config;
+import com.alttd.chat.managers.ChatUserManager;
+import com.alttd.chat.managers.RegexManager;
import com.alttd.chat.objects.ChatUser;
+import com.alttd.chat.util.Utility;
import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.proxy.Player;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.Template;
import java.util.*;
public class ChatHandler {
- public void privateMessage(PrivateMessageEvent event) {
+ public void globalChat(Player player, String message) {
+ ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
+ if(user == null) return;
+ MiniMessage miniMessage = MiniMessage.get();
+ if(!user.isGcOn()) {
+ player.sendMessage(miniMessage.parse(Config.GCNOTENABLED));// GC IS OFF INFORM THEM ABOUT THIS and cancel
+ return;
+ }
+
+ message = Utility.parseColors(message);
+ if(!player.hasPermission("chat.format")) // Todo PR fix for '<3' to minimessage
+ message = miniMessage.stripTokens(message);
+
+ message = RegexManager.replaceText(message); // this filters the message TODO should staff be able to bypass filters?
+
+ List templates = new ArrayList<>(List.of(
+ Template.of("sender", user.getDisplayName()),
+ Template.of("prefix", user.getPrefix()),
+ Template.of("message", message),
+ Template.of("server", player.getCurrentServer().isPresent() ? player.getCurrentServer().get().getServerInfo().getName() : "Altitude")
+ /*,Template.of("[i]", itemComponent(sender.getInventory().getItemInMainHand()))*/ //Todo move this into ChatFilters
+ ));
+
+ Component component = miniMessage.parse(Config.GCFORMAT, templates);
+
+ VelocityChat.getPlugin().getServerHandler().sendGlobalChat(component);
+
+ }
+
+ public void privateMessage(CommandSource commandSource, Player recipient, String message) {
+ // todo get the chatUserinstance of both players and or console - @teri should console be able to /msg?
String senderName;
String receiverName;
- CommandSource commandSource = event.getSender();
if (commandSource instanceof Player) {
- Player sender = (Player) event.getSender();
+ Player sender = (Player) commandSource;
senderName = sender.getUsername();
//plugin.getChatHandler().getChatPlayer(sender.getUniqueId()).setReplyTarget(event.getRecipient().getUniqueId()); // TODO this needs to be cleaner
} else {
senderName = Config.CONSOLENAME;
}
- receiverName = event.getRecipient().getUsername();
+ receiverName = recipient.getUsername();
MiniMessage miniMessage = MiniMessage.get();
+ message = Utility.parseColors(message);
+ if(!commandSource.hasPermission("chat.format")) // Todo PR fix for '<3' to minimessage
+ message = miniMessage.stripTokens(message);
+
+ message = RegexManager.replaceText(message); // this filters the message TODO should staff be able to bypass filters?
+
+// List templates = new ArrayList<>(List.of(
+// Template.of("sender", user.getDisplayName()),
+// Template.of("prefix", user.getPrefix()),
+// Template.of("message", message),
+// Template.of("server", player.getCurrentServer().isPresent() ? player.getCurrentServer().get().getServerInfo().getName() : "Altitude")
+// /*,Template.of("[i]", itemComponent(sender.getInventory().getItemInMainHand()))*/ //Todo move this into ChatFilters
+// ));
+
Map map = new HashMap<>();
map.put("sender", senderName);
map.put("receiver", receiverName);
- map.put("message", event.getMessage());
- map.put("server", event.getRecipient().getCurrentServer().isPresent() ? event.getRecipient().getCurrentServer().get().getServerInfo().getName() : "Altitude");
+ map.put("message", message);
+// map.put("server", event.getRecipient().getCurrentServer().isPresent() ? event.getRecipient().getCurrentServer().get().getServerInfo().getName() : "Altitude");
Component senderMessage = miniMessage.parse(Config.MESSAGESENDER, map);
Component receiverMessage = miniMessage.parse(Config.MESSAGERECIEVER, map);
- event.getSender().sendMessage(senderMessage);
- event.getRecipient().sendMessage(receiverMessage);
+ commandSource.sendMessage(senderMessage);
+ recipient.sendMessage(receiverMessage);
}
+ /**
+ * constructs a mail object and notifies all involved players about it
+ * / mail send playerA,playerB,playerC message
+ */
+ public void sendMail() {
+
+ }
+
+ /**
+ * @param message the messaged to be parsed by the chatfilter
+ * @param player the player invoking the message
+ * @return the message altered by the filters
+ */
+ public String applyChatFilters(String message, Player player) {
+ return "";
+ }
+
+ public void sendMail(CommandSource source, String message, List targets) {
+ }
}
diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java
index 66c0389..4ed44ea 100644
--- a/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java
+++ b/velocity/src/main/java/com/alttd/chat/handlers/ServerHandler.java
@@ -4,6 +4,7 @@ import com.alttd.chat.VelocityChat;
import com.alttd.chat.config.ServerConfig;
import com.alttd.chat.data.ServerWrapper;
import com.velocitypowered.api.proxy.server.RegisteredServer;
+import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import java.util.ArrayList;
@@ -34,10 +35,10 @@ public class ServerHandler {
}
}
- public void sendGlobalChat(String message) {
+ public void sendGlobalChat(Component message) {
servers.stream()
.filter(serverWrapper -> serverWrapper.globalChat())
- .forEach(serverWrapper -> serverWrapper.getRegisteredServer().sendMessage(MiniMessage.get().parse(message)));
+ .forEach(serverWrapper -> serverWrapper.getRegisteredServer().sendMessage(message));
}
public List getServers()
diff --git a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java
index c77c0ca..d00e391 100644
--- a/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java
+++ b/velocity/src/main/java/com/alttd/chat/listeners/ChatListener.java
@@ -1,8 +1,8 @@
package com.alttd.chat.listeners;
import com.alttd.chat.VelocityChat;
-import com.alttd.chat.api.GlobalAdminChatEvent;
-import com.alttd.chat.api.PrivateMessageEvent;
+import com.alttd.chat.events.GlobalAdminChatEvent;
+import com.alttd.chat.events.PrivateMessageEvent;
import com.alttd.chat.config.Config;
import com.alttd.chat.util.Utility;
import com.velocitypowered.api.command.CommandSource;
diff --git a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java b/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java
index fe40d66..3160318 100644
--- a/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java
+++ b/velocity/src/main/java/com/alttd/chat/listeners/PluginMessageListener.java
@@ -33,7 +33,8 @@ public class PluginMessageListener {
VelocityChat.getPlugin().getLogger().info("server " + event.getSource());
switch (channel) {
case "globalchat":
- VelocityChat.getPlugin().getServerHandler().sendGlobalChat(in.readUTF());
+ // todo this is obsolete
+ //VelocityChat.getPlugin().getServerHandler().sendGlobalChat(in.readUTF());
break;
default:
VelocityChat.getPlugin().getLogger().info("server " + event.getSource());