Fixed Word Blacklist

Fixed made by @Faab007 on Greazi's fork.

Author: TehZombiJesus

src/main/java/me/TechsCode/TechDiscordBot/module/modules/WordBlacklistModule.java

@@ -8,6 +8,7 @@
 import me.TechsCode.TechDiscordBot.util.TechEmbedBuilder;
 import net.dv8tion.jda.api.entities.Category;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
 import net.dv8tion.jda.api.hooks.SubscribeEvent;
 
 import java.awt.*;
@@ -17,15 +18,17 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
 public class WordBlacklistModule extends Module {
 
     private final DefinedQuery<Category> IGNORED_CATEGORIES = new DefinedQuery<Category>() {
         @Override
         protected Query<Category> newQuery() {
-            return bot.getCategories("\uD83D\uDCC1 | Archives", "\uD83D\uDCD1 | Staff Logs", "Other Staff Discussions", "staff discussions", "⚖ | Leadership-Discussions");
+            return bot.getCategories("\uD83D\uDCC1 | Archives", "\uD83D\uDCD1 | Staff Logs", "staff discussions", "⚖ | Leadership-Discussions");
         }
     };
 
@@ -58,15 +61,22 @@ public String getName() {
 
     @SubscribeEvent
     public void onMessage(GuildMessageReceivedEvent e) {
-        if (e.getMember() == null || e.getAuthor().isBot() || IGNORED_CATEGORIES.query().stream().anyMatch(c -> c.getId().equals(e.getChannel().getParent().getId()))) return;
+        if (e.getMember() == null || e.getAuthor().isBot() || IGNORED_CATEGORIES.query().stream().anyMatch(c -> c.getId().equals(Objects.requireNonNull(e.getChannel().getParent()).getId()))) return;
 
-        String message = e.getMessage().getContentRaw().toLowerCase();
-        String blacklist = String.join("|", BLACKLISTED_WORDS);
+        if (runMatcher(e.getMessage().getContentRaw().toLowerCase())){
+            e.getMessage().delete().queue();
+            new TechEmbedBuilder("Blocked Word(s)")
+                    .color(Color.RED)
+                    .text("Your message contained a world which is in our blacklist.\n\nIf you think this is a mistake, take a look at our [**word blacklist**](" + URL + ").")
+                    .sendTemporary(e.getChannel(), 10, TimeUnit.SECONDS);
+        }
+    }
 
-        String regex = "[^!@#$%^&*]*(" + blacklist + ")[^!@#$%^&*]*";
-        boolean blockMessage= Pattern.compile(regex, Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL).matcher(message).matches();
+    @SubscribeEvent
+    public void onMessageUpdate(GuildMessageUpdateEvent e) {
+        if (e.getMember() == null || e.getAuthor().isBot() || IGNORED_CATEGORIES.query().stream().anyMatch(c -> c.getId().equals(Objects.requireNonNull(e.getChannel().getParent()).getId()))) return;
 
-        if (blockMessage) {
+        if (runMatcher(e.getMessage().getContentRaw().toLowerCase())){
             e.getMessage().delete().queue();
             new TechEmbedBuilder("Blocked Word(s)")
                     .color(Color.RED)
@@ -75,6 +85,18 @@ public void onMessage(GuildMessageReceivedEvent e) {
         }
     }
 
+    public boolean runMatcher(String message){
+        AtomicBoolean blockMessage = new AtomicBoolean(false);
+        for (String regex : BLACKLISTED_WORDS) {
+            boolean match = Pattern.compile(regex, Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL).matcher(message).find();
+            if (match) {
+                blockMessage.set(true);
+                break;
+            }
+        }
+        return blockMessage.get();
+    }
+
     private void getBlacklist() {
         try {
             URL url = new URL(URL);
@@ -88,11 +110,25 @@ private void getBlacklist() {
                 BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
                 String inputLine;
 
+                BLACKLISTED_WORDS.clear();
                 while ((inputLine = in.readLine()) != null) {
                     String word = inputLine.trim().toLowerCase();
 
-                    if(!BLACKLISTED_WORDS.contains(word))
-                        BLACKLISTED_WORDS.add(word);
+                    String[] letters = word.split("");
+                    StringBuilder regex = new StringBuilder();
+                    regex.append("\\b(?i)(");
+                    for (int i = 0; i < letters.length; i++) {
+                        if (i == 0){
+                            regex.append(letters[i]).append("+(\\W|_)*");
+                        }else if(i == letters.length - 1){
+                            regex.append(letters[i]).append("+");
+                        }else{
+                            regex.append("(").append(letters[i]).append("?)+(\\W|_)*");
+                        }
+                    }
+                    regex.append(")");
+
+                    BLACKLISTED_WORDS.add(regex.toString());
                 }
 
                 in.close();
@@ -111,4 +147,4 @@ public Requirement[] getRequirements() {
                 new Requirement(IGNORED_CATEGORIES, IGNORED_CATEGORIES.query().amount(), "Could not find all of the ignored category channels.")
         };
     }
-}
+}