Upgrade to Discord4J 3.0.14, add all_roles config option, change comm…

…and format
ModdedMinecraftClub · May 27, 2020 · 9fede92 · 9fede92
1 parent dd83cea
commit 9fede92
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 84 deletions.
diff --git a/.idea/artifacts/Server_jar.xml b/.idea/artifacts/Server_jar.xml
diff --git a/...s/com_discord4j_discord4j_core_3_0_10.xml → ...s/com_discord4j_discord4j_core_3_0_14.xml b/...s/com_discord4j_discord4j_core_3_0_10.xml → ...s/com_discord4j_discord4j_core_3_0_14.xml
diff --git a/NetworkLibrary/src/club/moddedminecraft/polychat/networking/io/MessageReceiver.java b/NetworkLibrary/src/club/moddedminecraft/polychat/networking/io/MessageReceiver.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.Socket;
+import java.net.SocketException;
 
 public final class MessageReceiver {
     private final Socket socket;
@@ -82,7 +83,7 @@ private void receiverThread() {
                         System.err.println("[PolyChat] Warning: Illegal message id: " + messageId);
                 }
             }
-        } catch (InterruptedIOException | EOFException ignored) {
+        } catch (InterruptedIOException | EOFException | SocketException ignored) {
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/NetworkLibrary/src/club/moddedminecraft/polychat/networking/io/PlayerStatusMessage.java b/NetworkLibrary/src/club/moddedminecraft/polychat/networking/io/PlayerStatusMessage.java
@@ -29,10 +29,10 @@ public class PlayerStatusMessage extends AbstractMessage {
     private final String userName, serverID, formattedPrefix;
     private final boolean joined, silent;
 
-    public PlayerStatusMessage(String userName, String serverID, String prefixJson, boolean joined, boolean silent) {
+    public PlayerStatusMessage(String userName, String serverID, String formattedJson, boolean joined, boolean silent) {
         this.userName = userName;
         this.serverID = serverID;
-        this.formattedPrefix = prefixJson;
+        this.formattedPrefix = formattedJson;
         this.joined = joined;
         this.silent = silent;
     }

diff --git a/Server/Server.iml b/Server/Server.iml
@@ -10,6 +10,6 @@
     <orderEntry type="module" module-name="NetworkLibrary" />
     <orderEntry type="library" name="org.yaml:snakeyaml:1.25" level="project" />
     <orderEntry type="library" name="com.vdurmont:emoji-java:5.1.0" level="project" />
-    <orderEntry type="library" name="com.discord4j:discord4j-core:3.0.10" level="project" />
+    <orderEntry type="library" name="com.discord4j:discord4j-core:3.0.14" level="project" />
   </component>
 </module>
diff --git a/Server/src/club/moddedminecraft/polychat/server/DiscordHandler.java b/Server/src/club/moddedminecraft/polychat/server/DiscordHandler.java
@@ -106,15 +106,18 @@ public void registerCommands() throws FileNotFoundException, NoSuchMethodExcepti
 
         ArrayList<String> commandChannels = (ArrayList<String>) yamlObj.remove("channels");
         manager.setChannels(commandChannels);
-        for (Object entryObj : yamlObj.entrySet()) {
 
-            Map.Entry<String, ArrayList> entry = (Map.Entry<String, ArrayList>) entryObj;
+        ArrayList<String> prefixRoles = (ArrayList<String>) yamlObj.remove("all_roles");
+        manager.addPrefixRoles(prefixRoles);
+
+        for (Object entryObj : (ArrayList) yamlObj.get("commands")) {
+            LinkedHashMap entry = (LinkedHashMap) entryObj;
             HashMap<String, String> argMap = new HashMap<>();
-            for (Object mapObj : entry.getValue()) {
+            for (Object mapObj : (ArrayList) entry.values().iterator().next()) {
                 argMap.putAll((HashMap<String, String>) mapObj);
             }
 
-            String name = entry.getKey();
+            String name = (String) entry.keySet().iterator().next(); // kinda ugly but way too deep down the rabbit hole
             String type = argMap.remove("type");
 
             Class<? extends Command> element = COMMAND_TYPES.get(type);
@@ -143,8 +146,9 @@ public boolean processCommand(Message message) {
     }
 
     public void processMessage(Message message) {
-        ChatMessage discordMessage = new ChatMessage(message.getAuthorAsMember().block().getDisplayName() + ":", formatMessage(message), "empty");
-        System.out.println(discordMessage.getMessage());
+        String author = message.getAuthorAsMember().block().getDisplayName() + ":";
+        ChatMessage discordMessage = new ChatMessage(author, formatMessage(message), "empty");
+        System.out.println(String.format("[Discord] %s %s", author, discordMessage.getMessage()));
         Main.chatServer.sendMessage(discordMessage);
     }
 

diff --git a/Server/src/club/moddedminecraft/polychat/server/Main.java b/Server/src/club/moddedminecraft/polychat/server/Main.java
@@ -157,7 +157,7 @@ public static boolean handleConfig() {
 
     //Initializes the connection to the discord API using the API token
     public static void initDiscord() {
-        discordClient = new DiscordClientBuilder(config.getProperty("api_token")).build();
+        discordClient = DiscordClientBuilder.create(config.getProperty("api_token")).build();
         discordHandler.registerEventSubscribers(discordClient);
         discordClient.login().block();
     }