progress

api/src/main/java/com/alttd/chat/managers/ChatUserManager.java

@@ -4,6 +4,7 @@ import com.alttd.chat.database.Queries;
 import com.alttd.chat.objects.ChatUser;
 import com.alttd.chat.objects.Mail;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -11,25 +12,27 @@ import java.util.stream.Collectors;
 
 public final class ChatUserManager {
 
-    private static CopyOnWriteArrayList<ChatUser> chatUsers;// not sure on this, could cause errors later on
+    private static ArrayList<ChatUser> chatUsers;// not sure on this, could cause errors later on
 
     public static void initialize() {
-        chatUsers = new CopyOnWriteArrayList<>();
-        Queries.loadChatUsers();
+        chatUsers = new ArrayList<>();
+        //Queries.loadChatUsers(); // todo fix sql
     }
 
     public static void addUser(ChatUser user) {
-        if(getChatUser(user.getUuid()) != null)
+        if(getChatUser(user.getUuid()) == null)
             chatUsers.add(user);
     }
 
     public static ChatUser getChatUser(UUID uuid) {
         for(ChatUser user : chatUsers) {
-            if(user.getUuid() == uuid) {
+            if(uuid.compareTo(user.getUuid()) == 0) {
                 return user;
             }
         }
-        return null;
+        ChatUser user = new ChatUser(uuid, -1, false, false);
+        chatUsers.add(user);
+        return user; // create a new user?
     }
 
     public List<Mail> getUnReadMail(ChatUser user) {

api/src/main/java/com/alttd/chat/managers/RegexManager.java

@@ -2,7 +2,7 @@ package com.alttd.chat.managers;
 
 import com.alttd.chat.config.RegexConfig;
 import com.alttd.chat.objects.ChatFilter;
-import com.alttd.chat.objects.FilterType;
+import com.alttd.chat.util.ALogger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,22 +18,15 @@ public class RegexManager {
     }
 
     public static void addFilter(ChatFilter filter) {
+        ALogger.info("Adding " + filter.getName());
         chatFilters.add(filter);
     }
-//    public static boolean violatesFilter(String text) {
-//        for (Map.Entry<Pattern, ArrayList<String>> entry : cancelRegex.entrySet()) {
-//            Matcher matcher = entry.getKey().matcher(text);
-//            while (matcher.find()) {
-//                if (!entry.getValue().contains(matcher.group())) return true;
-//            }
-//        }
-//        return false;
-//    }
 
     public static String replaceText(String text) { // TODO loop all objects in the list and check if they violate based on the MATCHER
         for(ChatFilter chatFilter : chatFilters) {
-
             switch (chatFilter.getType()) {
+                case CHAT:
+                    break;
                 case REPLACE:
                     text = chatFilter.replaceText(text);
                     break;
@@ -44,9 +37,6 @@ public class RegexManager {
                     break;
             }
         }
-//        for (Map.Entry<String, String> entry : replaceRegex.entrySet()) {
-//            text = text.replaceAll(entry.getKey(), entry.getValue());
-//        }
         return text;
     }