Added link regex in config file for chat control

Author: OllieMartin

multichat/src/main/java/xyz/olivermartin/multichat/bungee/ChatControl.java

@@ -25,8 +25,9 @@ public class ChatControl {
 	private static Set<UUID> mutedPlayers;
 	private static Map<UUID, Set<UUID>> ignoreMap;
 	private static Map<UUID, PlayerSpamInfo> spamMap;
-	
+
 	public static boolean controlLinks = false;
+	public static String linkRegex = "((https|http):\\/\\/)?(www\\.)?([-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.)+[a-zA-Z]{2,4}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)";
 	public static String linkMessage = "[LINK REMOVED]";
 
 	public static Set<UUID> getMutedPlayers() {
@@ -282,10 +283,11 @@ public static void reload() {
 		}
 
 	}
-	
+
 	public static String replaceLinks(String message) {
 		if (!controlLinks) return message;
-		return message.replaceAll("((https|http):\\/\\/)?(www\\.)?([-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.)+[a-zA-Z]{2,4}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)", linkMessage);
+		return message.replaceAll(linkRegex, linkMessage);
+		//return message.replaceAll("((https|http):\\/\\/)?(www\\.)?([-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.)+[a-zA-Z]{2,4}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)", linkMessage);
 	}
 
 	public static void spamPardonPlayer(UUID uuid) {
@@ -297,23 +299,23 @@ public static void spamPardonPlayer(UUID uuid) {
 	 * @return true if the player is spamming and the message should be blocked
 	 */
 	public static boolean handleSpam(ProxiedPlayer player, String message, String chatType) {
-		
+
 		DebugManager.log(player.getName() + " - checking for spam...");
 
 		Configuration config = ConfigManager.getInstance().getHandler("chatcontrol.yml").getConfig();
-		
+
 		if (player.hasPermission("multichat.spam.bypass")) return false;
-		
+
 		DebugManager.log(player.getName() + " - does not have bypass perm...");
 
 		if (!config.getBoolean("anti_spam")) return false;
-		
+
 		DebugManager.log(player.getName() + " - anti spam IS enabled...");
 
 		if (!config.contains("apply_anti_spam_to." + chatType)) return false;
 
 		if (!config.getBoolean("apply_anti_spam_to." + chatType)) return false;
-		
+
 		DebugManager.log(player.getName() + " - anti spam IS enabled for " + chatType + "...");
 
 		if (!spamMap.containsKey(player.getUniqueId())) spamMap.put(player.getUniqueId(), new PlayerSpamInfo());
@@ -323,21 +325,21 @@ public static boolean handleSpam(ProxiedPlayer player, String message, String ch
 		boolean spam = spamInfo.checkSpam(message);
 
 		if (spam) {
-			
+
 			DebugManager.log(player.getName() + " - PLAYER IS SPAMMING!");
 
 			MessageManager.sendSpecialMessage(player, "anti_spam_cooldown", String.valueOf(spamInfo.getCooldownSeconds()));
-			
+
 			DebugManager.log(player.getName() + " - sent cooldown message to player...");
 
 			if (spamInfo.getSpamTriggerCount() >= config.getInt("anti_spam_trigger")) {
-				
+
 				DebugManager.log(player.getName() + " - they have set off the trigger...");
 
 				spamInfo.resetSpamTriggerCount();
 
 				if (config.getBoolean("anti_spam_action")) {
-					
+
 					DebugManager.log(player.getName() + " - trigger IS enabled...");
 
 					if (config.getBoolean("anti_spam_spigot")) {
@@ -352,7 +354,7 @@ public static boolean handleSpam(ProxiedPlayer player, String message, String ch
 			}
 
 		}
-		
+
 		DebugManager.log(player.getName() + " - returning " + spam);
 
 		return spam;

multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java

@@ -317,6 +317,9 @@ public void onEnable() {
 			if (chatcontrolYML.contains("link_control")) {
 				ChatControl.controlLinks = chatcontrolYML.getBoolean("link_control");
 				ChatControl.linkMessage = chatcontrolYML.getString("link_removal_message");
+				if (chatcontrolYML.contains("link_regex")) {
+					ChatControl.linkRegex = chatcontrolYML.getString("link_regex");
+				}
 			}
 
 			if (configYML.contains("privacy_settings")) {

multichat/src/main/java/xyz/olivermartin/multichat/bungee/commands/MultiChatCommand.java

@@ -122,6 +122,9 @@ public void execute(CommandSender sender, String[] args) {
 					if (ConfigManager.getInstance().getHandler("chatcontrol.yml").getConfig().contains("link_control")) {
 						ChatControl.controlLinks = ConfigManager.getInstance().getHandler("chatcontrol.yml").getConfig().getBoolean("link_control");
 						ChatControl.linkMessage = ConfigManager.getInstance().getHandler("chatcontrol.yml").getConfig().getString("link_removal_message");
+						if (ConfigManager.getInstance().getHandler("chatcontrol.yml").getConfig().contains("link_regex")) {
+							ChatControl.linkRegex = ConfigManager.getInstance().getHandler("chatcontrol.yml").getConfig().getString("link_regex");
+						}
 					}
 
 					if (ConfigManager.getInstance().getHandler("config.yml").getConfig().contains("privacy_settings")) {

multichat/src/main/resources/chatcontrol.yml

@@ -187,6 +187,7 @@ ignorecommand:
 # Should MultiChat control which players can send links to chat?
 # If set to true, then only players with multichat.chat.link will be able to send links
 link_control: false
+link_regex: "((https|http):\/\/)?(www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.)+[a-zA-Z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&\/\/=]*)"
 
 # Message to replace links in chat with
 link_removal_message: "[LINK REMOVED]"