Antispam now considers player names as lower case

ChatPlugin · Apr 20, 2024 · 5f7567d · 5f7567d
1 parent d605a28
commit 5f7567d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/api/src/main/java/me/remigio07/chatplugin/api/server/chat/antispam/AntispamManager.java b/api/src/main/java/me/remigio07/chatplugin/api/server/chat/antispam/AntispamManager.java
@@ -290,6 +290,8 @@ public static AntispamManager getInstance() {
 	/**
 	 * Gets the amount of caps characters in the specified message.
 	 * 
+	 * <p>This will consider player names as lower case.</p>
+	 * 
 	 * @param message Message to check
 	 * @return Caps characters in the message
 	 */
@@ -298,6 +300,8 @@ public static AntispamManager getInstance() {
 	/**
 	 * Gets the caps percentage amount of a message.
 	 * 
+	 * <p>This will consider player names as lower case.</p>
+	 * 
 	 * @param message Message to check
 	 * @return Caps percentage in the message
 	 */

diff --git a/free/src/main/java/me/remigio07/chatplugin/server/chat/antispam/AntispamManagerImpl.java b/free/src/main/java/me/remigio07/chatplugin/server/chat/antispam/AntispamManagerImpl.java
@@ -32,6 +32,7 @@
 import me.remigio07.chatplugin.api.server.chat.antispam.AntispamManager;
 import me.remigio07.chatplugin.api.server.chat.antispam.DenyChatReason;
 import me.remigio07.chatplugin.api.server.player.ChatPluginServerPlayer;
+import me.remigio07.chatplugin.api.server.player.ServerPlayerManager;
 import me.remigio07.chatplugin.api.server.util.URLValidator;
 
 public class AntispamManagerImpl extends AntispamManager {
@@ -165,10 +166,10 @@ public boolean containsDisallowedURL(String message) {
 				StringBuilder domain = new StringBuilder();
 
 				for (int i = 0; i < domainName.length(); i++) {
-					int codePoint = (int) domainName.charAt(i);
+					char character = domainName.charAt(i);
 
-					if (Character.isLetter(codePoint) || codePoint > 47 && codePoint < 58 || codePoint == 45) {
-						domain.append((char) codePoint);
+					if (isNumber(character) || Character.isLetter(character) || character == '-') {
+						domain.append(character);
 					} else if (domain.charAt(domain.length() - 1) != '.')
 						domain.append('.');
 				} domain.append(tld);
@@ -191,17 +192,21 @@ public boolean containsDisallowedIP(String message) {
 			String dirtyIPAddress = matcher.group();
 
 			for (int i = 0; i < dirtyIPAddress.length(); i++) {
-				int codePoint = (int) dirtyIPAddress.charAt(i);
+				char character = dirtyIPAddress.charAt(i);
 
-				if (codePoint > 47 && codePoint < 58)
-					ipAddress.append((char) codePoint);
+				if (isNumber(character))
+					ipAddress.append(character);
 				else if (ipAddress.charAt(ipAddress.length() - 1) != '.')
 					ipAddress.append('.');
 			} if (!ipsWhitelist.contains(ipAddress.toString()))
 				return true;
 		} return false;
 	}
 
+	private boolean isNumber(char character) {
+		return character > 47 && character < 58;
+	}
+
 	@Override
 	public boolean containsBlacklistedWord(String message) {
 		if (leetFilterEnabled)
@@ -234,12 +239,17 @@ public boolean exceedsMaxCapsPercentage(String message) {
 
 	@Override
 	public int getCapsLength(String message) {
-		int i = 0;
+		List<String> playersNames = ServerPlayerManager.getInstance().getPlayersNames();
+		int length = 0;
 
-		for (Character character : message.toCharArray())
-			if (Character.isUpperCase(character))
-				i++;
-		return i;
+		for (String word : message.split(" "))
+			if (!playersNames.contains(isAllowedInPlayerNames((word = word.startsWith("@") && word.length() > 1 ? word.substring(1) : word).charAt(word.length() - 1)) ? word : word.substring(0, word.length() - 1)))
+				length += word.chars().filter(Character::isUpperCase).count();
+		return length;
+	}
+
+	private boolean isAllowedInPlayerNames(char character) {
+		return isNumber(character) || Character.isLetter(character) || character == '_';
 	}
 
 	@Override