From 2d7d39a86d157e105c56ddc63156d32281cfe716 Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Sun, 1 Aug 2021 15:08:24 +0200
Subject: [PATCH] Load ChatUsers async

---
 .../alttd/chat/managers/ChatUserManager.java  | 16 ++++++-----
 galaxy/dependency-reduced-pom.xml             | 27 +++++++++++++++++++
 .../alttd/chat/listeners/PlayerListener.java  |  2 +-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
index e626f31..47aea08 100755
--- a/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
+++ b/api/src/main/java/com/alttd/chat/managers/ChatUserManager.java
@@ -7,11 +7,12 @@ import com.alttd.chat.objects.Mail;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 public final class ChatUserManager {
 
-    private static ArrayList<ChatUser> chatUsers;// not sure on this, could cause errors later on
+    private static ArrayList<ChatUser> chatUsers;
 
     public static void initialize() {
         chatUsers = new ArrayList<>();
@@ -31,11 +32,14 @@ public final class ChatUserManager {
                 return user;
             }
         }
-        ChatUser chatUser = Queries.loadChatUser(uuid);
-        if (chatUser != null) {
-            ChatUserManager.addUser(chatUser);
-        }
-        return chatUser;
+        // todo move the CompletableFuture to Queries
+        return CompletableFuture.supplyAsync(() -> {
+            ChatUser loadChatUser = Queries.loadChatUser(uuid);
+            if (loadChatUser != null) {
+                ChatUserManager.addUser(loadChatUser);
+            }
+            return loadChatUser;
+        }).join();
 //        if(user == null) user = new ChatUser(uuid, -1, false, false);
 //        Queries.saveUser(user);
 //        chatUsers.add(user);
diff --git a/galaxy/dependency-reduced-pom.xml b/galaxy/dependency-reduced-pom.xml
index 03d26e0..47374fc 100644
--- a/galaxy/dependency-reduced-pom.xml
+++ b/galaxy/dependency-reduced-pom.xml
@@ -56,6 +56,15 @@
       <id>placeholderapi</id>
       <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
     </repository>
+    <repository>
+      <id>dv8tion</id>
+      <name>m2-dv8tion</name>
+      <url>https://m2.dv8tion.net/releases</url>
+    </repository>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
   </repositories>
   <dependencies>
     <dependency>
@@ -70,12 +79,30 @@
       <version>1.7.30</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>net.dv8tion</groupId>
+      <artifactId>JDA</artifactId>
+      <version>4.3.0_291</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>opus-java</artifactId>
+          <groupId>club.minnced</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>me.clip</groupId>
       <artifactId>placeholderapi</artifactId>
       <version>2.10.10</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.gitlab.ruany</groupId>
+      <artifactId>LiteBansAPI</artifactId>
+      <version>0.3.4</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <properties>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java
index bdb3282..6d903be 100755
--- a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java
+++ b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java
@@ -25,7 +25,7 @@ public class PlayerListener implements Listener {
         ChatUser user = ChatUserManager.getChatUser(uuid);
         if(user != null) return;
 
-        // todo actually load the users from db
+        // user failed to load - create a new one
         ChatUser chatUser = new ChatUser(uuid, -1, false, false);
         ChatUserManager.addUser(chatUser);
         Queries.saveUser(chatUser);