added changes from short message spam branch and uuid instead of strings

Author: bierdosenhalter

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: 🧑‍🏭
+name: "🧑‍🏭"
 
 on:
   push:

.github/workflows/verify.yml

@@ -1,12 +1,12 @@
-name: 🧑‍🏭
+name: "🚔"
 
 on:
   push:
     branches:
       - '*'
 
 jobs:
-  release:
+  verify:
     runs-on: ubuntu-latest
     steps:
 

README.md

@@ -1,10 +1,12 @@
-## AntiSpam
-
+# AntiSpam
 [![discord](https://img.shields.io/discord/843551077759844362?logo=discord)](https://discord.gg/7tW8ZAtGr5)
 [![reddit](https://img.shields.io/reddit/subreddit-subscribers/0b0t)](https://old.reddit.com/r/0b0t/)
-[![download](https://img.shields.io/github/downloads/zeroBzeroT/AntiSpam/latest/total.svg?label=download%20latest)](https://github.com/zeroBzeroT/AntiSpam/releases/latest)
-![last commit](https://img.shields.io/github/last-commit/zeroBzeroT/AntiSpam)
-![lines of code](https://tokei.rs/b1/github/zeroBzeroT/AntiSpam)
-![repo size](https://img.shields.io/github/languages/code-size/zeroBzeroT/AntiSpam.svg?label=repo%20size)
-
-No chat until a block has been run and checked for spam over the Levenshtein distance and Unicode ranges.
+## Checks
+- recurring (levenshtein distance)
+    - old spam
+    - old messages
+- no blank spaces
+- not moved yet
+- flood
+- unicode ranges
+- short messages

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>org.zeroBzeroT</groupId>
   <artifactId>0b0t_AntiSpam</artifactId>
-  <version>1.11</version>
+  <version>1.12</version>
   <packaging>jar</packaging>
   <description>No chat until a block is run and check for spam via Levenshtein distance.</description>
 
@@ -63,13 +63,13 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.7.2</version>
+      <version>5.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
-      <version>5.7.2</version>
+      <version>5.8.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/org/zeroBzeroT/antispam/AntiSpam.java

@@ -17,14 +17,17 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 public class AntiSpam extends JavaPlugin implements Listener, CommandExecutor {
-    public static List<String> bots = new ArrayList<>();
-    static List<String> whisperCommands = new ArrayList<>();
-    final ArrayList<Player> notMoved = new ArrayList<>();
+    private static final Set<UUID> bots = new HashSet<>();
+    private static final Set<String> whisperCommands = new HashSet<>();
+    private final Set<UUID> notMoved = ConcurrentHashMap.newKeySet();
 
     FileConfiguration config;
 
@@ -46,8 +49,8 @@ public void onEnable() {
         saveDefaultConfig();
         config = this.getConfig();
 
-        bots = config.getStringList("bots");
-        whisperCommands = config.getStringList("whisperCommands");
+        bots.addAll(config.getStringList("bots").stream().map(UUID::fromString).collect(Collectors.toSet()));
+        whisperCommands.addAll(config.getStringList("whisperCommands"));
         notMovedCheckEnabled = config.getBoolean("not-moved-check-enabled");
         messageCannotTalk = getConfig().getString("cannot-talk");
         messageSpamTalk = getConfig().getString("spam-talk-message");
@@ -73,7 +76,8 @@ public void onEnable() {
         isSpam = false;
 
         Bukkit.getScheduler().scheduleSyncRepeatingTask(this, () -> {
-            int threshold = config.getInt("maximum-characters-per-minute") * Bukkit.getOnlinePlayers().size() / 2;
+            // assume that only 10% of the players ever chat ;)
+            int threshold = config.getInt("maximum-characters-per-minute") * Bukkit.getOnlinePlayers().size() / 10;
             isSpam = cumulatedMessageSize > threshold;
 
             log("isSpam", "Spam: " + isSpam + " Size: " + cumulatedMessageSize + " Threshold: " + threshold);
@@ -158,8 +162,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
     @EventHandler
     public void onPlayerLeaveEvent(PlayerQuitEvent event) {
         if (notMovedCheckEnabled) {
-            Player player = event.getPlayer();
-            notMovedRemove(player);
+            notMoved.remove(event.getPlayer().getUniqueId());
         }
 
         spamBotCheck.setPlayerCount(getServer().getOnlinePlayers().size());
@@ -175,10 +178,7 @@ public void onPlayerLeaveEvent(PlayerQuitEvent event) {
     public void onPlayerChat(AsyncPlayerChatEvent event) {
         cumulatedMessageSize += event.getMessage().length();
 
-        Player player = event.getPlayer();
-        String message = event.getMessage();
-
-        if (isSpam(player, message, false)) {
+        if (isSpam(event.getPlayer(), event.getMessage(), false)) {
             event.setCancelled(true);
         }
     }
@@ -191,7 +191,6 @@ public void onPlayerChat(AsyncPlayerChatEvent event) {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        Player player = event.getPlayer();
         String message = event.getMessage();
 
         if (whisperCommands.stream().anyMatch(cmd -> message.toLowerCase().startsWith("/" + cmd + " "))) {
@@ -200,7 +199,7 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
             if (messagePart.length == 3) {
                 cumulatedMessageSize += event.getMessage().length();
 
-                if (isSpam(player, messagePart[2], true)) {
+                if (isSpam(event.getPlayer(), messagePart[2], true)) {
                     event.setCancelled(true);
                 }
             }
@@ -222,9 +221,7 @@ public void onPlayerMove(PlayerMoveEvent e) {
 
         Player player = e.getPlayer();
 
-        if (this.notMoved.contains(player)) {
-            notMovedRemove(player);
-        }
+        notMoved.remove(e.getPlayer().getUniqueId());
     }
 
     /**
@@ -245,7 +242,7 @@ private boolean isSpam(Player player, String message, boolean isWhispering) {
             return false;
         }
 
-        if (notMovedCheckEnabled && this.notMoved.contains(player)) {
+        if (notMovedCheckEnabled && this.notMoved.contains(player.getUniqueId())) {
             player.sendMessage(ChatColor.translateAlternateColorCodes('&', messageCannotTalk));
             return true;
         }
@@ -260,7 +257,7 @@ private boolean isSpam(Player player, String message, boolean isWhispering) {
             // cooldown for the new message is added even on violation
             isSpam = true;
             failedTest = "Flood";
-        } else if (spamBotCheck.isNoBlanksSpam(message)) {
+        } else if (spamBotCheck.isNoBlanksSpam(player.getUniqueId(), message)) {
             // checks the frequency of whitespaces
             isSpam = true;
             failedTest = "No Blanks";
@@ -288,22 +285,22 @@ private boolean isSpam(Player player, String message, boolean isWhispering) {
 
     /**
      * Checks, if a certain player is in the bot whitelist
-     * TODO: add UUID check
      *
      * @param player
      * @return
      */
     private boolean isBot(Player player) {
-        for (String bot : AntiSpam.bots) {
-            if (player.getName().toLowerCase().contentEquals(bot.toLowerCase())) {
-                return true;
-            }
-            //if(player.getUniqueId().equals(UUID.fromString(bot))) {
-            //    return true;
-            //}
-        }
+        return isBot(player.getUniqueId());
+    }
 
-        return false;
+    /**
+     * Checks, if a certain uuid is in the bot whitelist
+     *
+     * @param uuid
+     * @return
+     */
+    private boolean isBot(UUID uuid) {
+        return bots.contains(uuid);
     }
 
     /**
@@ -312,27 +309,16 @@ private boolean isBot(Player player) {
      * @param player
      */
     private void notMovedAdd(Player player) {
-        for (String bot : bots) {
-            if (bot.toLowerCase().contentEquals(player.getName().toLowerCase())) {
-                log("Bot", player.getName());
-                return;
-            }
+        if (bots.contains(player.getUniqueId())) {
+            log("Bot", player.getName());
+            return;
         }
 
         if (!player.hasPermission("move.bypass")) {
-            this.notMoved.add(player);
+            this.notMoved.add(player.getUniqueId());
         }
     }
 
-    /**
-     * remove "not moved" flag
-     *
-     * @param player
-     */
-    private void notMovedRemove(Player player) {
-        this.notMoved.remove(player);
-    }
-
     /**
      * print a log message
      *

src/main/java/org/zeroBzeroT/antispam/SpamCheck.java

@@ -46,6 +46,9 @@ public class SpamCheck {
     // time at which the player is allowed to chat again
     private final ConcurrentHashMap<UUID, Long> momentNextChatAllowed = new ConcurrentHashMap<>();
 
+    // time at which the player is allowed to chat again
+    private final ConcurrentHashMap<UUID, Integer> shortMessageCount = new ConcurrentHashMap<>();
+
     // sanitizing message from chars that are from unicode ranges that are only used a few times in that message
     private UnicodeRanges unicodeRanges;
 
@@ -212,11 +215,28 @@ public boolean isRecurringSpam(String message) {
      * @param message
      * @return
      */
-    public boolean isNoBlanksSpam(String message) {
+    public boolean isNoBlanksSpam(UUID uuid, String message) {
         // assume that the end of the text corresponds to one whitespace (+1)
-        float whitespace = (message.length() - message.replaceAll(" ", "").length() + 1f);
+        float whitespaceCount = (message.length() - message.replaceAll(" ", "").length());
+
+        if (whitespaceCount < 2) {
+            // sentence has 2 or less whitespaces - temporary
+            // TODO: maybe add a bucket cooldown thing here instead of that hardcoded crap
+            shortMessageCount.putIfAbsent(uuid, 0);
+
+            Integer count = shortMessageCount.get(uuid);
+
+            if (count < 3) {
+                shortMessageCount.put(uuid, count + 1);
+            } else {
+                return true;
+            }
+        } else {
+            shortMessageCount.remove(uuid);
+        }
 
-        return (whitespace / message.length()) < whitespaceFrequency;
+        // Percentage of whitespace needed in long messages
+        return ((whitespaceCount + 1f) / message.length()) < whitespaceFrequency;
     }
 
     /**
@@ -269,9 +289,10 @@ public void setPlayerCount(int count) {
     /**
      * Removes a player from
      *
-     * @param player
+     * @param uuid
      */
-    public void onPlayerLeave(UUID player) {
-        momentNextChatAllowed.remove(player);
+    public void onPlayerLeave(UUID uuid) {
+        momentNextChatAllowed.remove(uuid);
+        shortMessageCount.remove(uuid);
     }
 }

src/main/resources/config.yml

@@ -19,5 +19,9 @@ whisperCommands:
   - "msg"
   - "whisper"
 bots:
-  - "moooomoooo"
-  - "6259c4b5-759f-4252-a6f7-d77818e125eb"
+  - "6259c4b5-759f-4252-a6f7-d77818e125eb" # AnarchyB0T
+  - "ddac1529-0729-4791-aa72-d82960ed8580" # moooomoooo
+  - "f4e4573e-0bfa-4ae8-9f4c-c1d935e0b050" # Leeunderscore
+  - "6a11762d-6d74-4a99-9980-3d9212b3bc7b" # Omega19
+  - "ab504f4f-82a5-4129-809a-58aececcd328" # bierdosenhalter
+  - "8aeaa92e-6a9f-400a-94d5-22b31c96f0d5" # 0Bot

src/test/java/org/zeroBzeroT/antispam/SpamCheckTest.java

@@ -32,7 +32,7 @@ boolean runTests(String message, boolean testFlood) {
          if (testFlood && spamCheck.isFloodSpam(uuid, message)) {
             //System.out.println("Failed Flood " + message);
             return true;
-        } else if (spamCheck.isNoBlanksSpam(message)) {
+        } else if (spamCheck.isNoBlanksSpam(uuid, message)) {
             //System.out.println("Failed No Blanks " + message);
             return true;
         } else if (spamCheck.isUnicodeRangeSpam(message)) {
@@ -60,11 +60,11 @@ void testSimple() {
         cnt++;
         Assertions.assertTrue(runTests("testtesttest"));
         cnt++;
-        Assertions.assertFalse(runTests(""));
+        Assertions.assertTrue(runTests(""));
         cnt++;
-        Assertions.assertFalse(runTests("testtest"));
+        Assertions.assertTrue(runTests("testtest"));
         cnt++;
-        Assertions.assertFalse(runTests(""));
+        Assertions.assertTrue(runTests(""));
         cnt++;
 
 
@@ -111,7 +111,7 @@ void testAlphanumericNonsense() {
         cnt++;
         Assertions.assertTrue(runTests("E01IDZxvl1G6KAMovPj1aegbsjd6FYTAvE0rRzYHN4fXJbxhc2glS1iADpuSKeNyOYlLnqJMxW6B0u7PNebFLxd4ru22vg7QSeZ6ZNJbViAmK6KhJ400Q54H8qTQ37NkpAEQ1kFbn8kKa2Bd2WQrEFNnnlng9nhA3C8mppNbbiRYWXo2daNH8FaKOCfGoMtbMJno8NYW"));
         cnt++;
-        Assertions.assertFalse(runTests(""));
+        Assertions.assertTrue(runTests(""));
         cnt++;
 
         final long end = System.currentTimeMillis() - start;
@@ -133,9 +133,9 @@ void testShortWordSpam() {
         cnt++;
         Assertions.assertTrue(runTests("testtesttest"));
         cnt++;
-        Assertions.assertFalse(runTests(""));
+        Assertions.assertTrue(runTests(""));
         cnt++;
-        Assertions.assertFalse(runTests("testtest"));
+        Assertions.assertTrue(runTests("testtest"));
         cnt++;
 
         final long end = System.currentTimeMillis() - start;
@@ -251,9 +251,9 @@ void testNormalChat() {
         cnt++;
         Assertions.assertFalse(runTests("gg"));
         cnt++;
-        Assertions.assertFalse(runTests("\\ban nnhtrrt"));
+        Assertions.assertTrue(runTests("\\ban nnhtrrt"));
         cnt++;
-        Assertions.assertFalse(runTests("done :D"));
+        Assertions.assertTrue(runTests("done :D"));
         cnt++;
         Assertions.assertFalse(runTests("gg im mainhanding tho"));
         cnt++;
@@ -269,13 +269,13 @@ void testNormalChat() {
         cnt++;
         Assertions.assertFalse(runTests("nnhtrrt"));
         cnt++;
-        Assertions.assertFalse(runTests("ofc"));
+        Assertions.assertTrue(runTests("ofc"));
         cnt++;
-        Assertions.assertFalse(runTests("tp"));
+        Assertions.assertTrue(runTests("tp"));
         cnt++;
-        Assertions.assertFalse(runTests("no you"));
+        Assertions.assertTrue(runTests("no you"));
         cnt++;
-        Assertions.assertFalse(runTests("!reports"));
+        Assertions.assertTrue(runTests("!reports"));
         cnt++;
         Assertions.assertFalse(runTests("You didn't say a playername to report."));
         cnt++;
@@ -291,7 +291,7 @@ void testNormalChat() {
         cnt++;
         Assertions.assertFalse(runTests("!quote"));
         cnt++;
-        Assertions.assertFalse(runTests("OMGOMGOMG"));
+        Assertions.assertTrue(runTests("OMGOMGOMG"));
         cnt++;
         Assertions.assertFalse(runTests("i ate achocolate odughnut and put it in teh trash can in my bathroom so someone will go in an say who wuped shit on the napkin teehee when its really icing teehee"));
         cnt++;