From 8fc9e0c447d2e8e15993256ff5a1fd40b44263e8 Mon Sep 17 00:00:00 2001
From: len <40720638+destro174@users.noreply.github.com>
Date: Thu, 20 May 2021 18:47:22 +0200
Subject: [PATCH] Refactor RegexObject to ChatFilter and ChatFilterType

---
 .../main/java/com/alttd/chat/managers/RegexManager.java   | 7 +++----
 api/src/main/java/com/alttd/chat/objects/ChatFilter.java  | 8 ++++----
 .../chat/objects/{RegexType.java => ChatFilterType.java}  | 8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename api/src/main/java/com/alttd/chat/objects/{RegexType.java => ChatFilterType.java} (60%)

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 9132b0f..a750ab5 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.RegexType;
+import com.alttd.chat.objects.ChatFilterType;
 import com.google.common.collect.Lists;
 import ninja.leaping.configurate.ConfigurationNode;
 
@@ -14,7 +14,6 @@ import java.util.regex.Pattern;
 
 public class RegexManager {
 
-    // todo move this to API!
     private static final HashMap<Pattern, ArrayList<String>> cancelRegex = new HashMap<>();
     private static final HashMap<String, String> replaceRegex = new HashMap<>();
 
@@ -24,9 +23,9 @@ public class RegexManager {
         // maiby a REGEXobject and a list<Regex> would be better here?
         for(ConfigurationNode node : Config.REGEXNODE.getChildrenMap().values()) {
             RegexConfig regexConfig = new RegexConfig(node.getString());
-            if (RegexType.getType(regexConfig.TYPE) == RegexType.BLOCK) {
+            if (ChatFilterType.getType(regexConfig.TYPE) == ChatFilterType.BLOCK) {
                 cancelRegex.put(Pattern.compile(regexConfig.REGEX), Lists.newArrayList(regexConfig.REPLACEMENT));
-            } else if (RegexType.getType(regexConfig.TYPE) == RegexType.REPLACE) {
+            } else if (ChatFilterType.getType(regexConfig.TYPE) == ChatFilterType.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 7f1c4a6..c1a9117 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 RegexType type;
+    private final ChatFilterType type;
     private String replacement = "";
 
-    public ChatFilter(String regex, RegexType type) {
+    public ChatFilter(String regex, ChatFilterType type) {
         this.regex = regex;
         this.type = type;
     }
 
-    public ChatFilter(String regex, RegexType type, String replacement) {
+    public ChatFilter(String regex, ChatFilterType type, String replacement) {
         this.regex = regex;
         this.type = type;
         this.replacement = replacement;
@@ -21,7 +21,7 @@ public class ChatFilter {
         return regex;
     }
 
-    public RegexType getType() {
+    public ChatFilterType getType() {
         return type;
     }
 
diff --git a/api/src/main/java/com/alttd/chat/objects/RegexType.java b/api/src/main/java/com/alttd/chat/objects/ChatFilterType.java
similarity index 60%
rename from api/src/main/java/com/alttd/chat/objects/RegexType.java
rename to api/src/main/java/com/alttd/chat/objects/ChatFilterType.java
index 1d163dd..f262bc8 100644
--- a/api/src/main/java/com/alttd/chat/objects/RegexType.java
+++ b/api/src/main/java/com/alttd/chat/objects/ChatFilterType.java
@@ -1,17 +1,17 @@
 package com.alttd.chat.objects;
 
-public enum RegexType {
+public enum ChatFilterType {
     REPLACE("replace"),
     BLOCK("block");
 
     private final String name;
 
-    RegexType(String name) {
+    ChatFilterType(String name) {
         this.name = name;
     }
 
-    public static RegexType getType(String name) {
-        for (RegexType type : RegexType.values()) {
+    public static ChatFilterType getType(String name) {
+        for (ChatFilterType type : ChatFilterType.values()) {
             if (type.name.equalsIgnoreCase(name)) {
                 return type;
             }