Fix chat formatting for missing groups

Author: Innectic

API/src/main/java/me/innectic/permissify/api/util/ChatFormatter.java

@@ -52,12 +52,16 @@ public static String formatChat(UUID uuid, String username, String message) {
         DatabaseHandler handler = PermissifyAPI.get().get().getDatabaseHandler().get();
 
         Optional<PermissionGroup> group = handler.getPrimaryGroup(uuid);
-        if (!group.isPresent()) return username + ": " + message;
+        if (!group.isPresent()) return username + ": " + message; // TODO: Should be configurable
+        String prefix = group.map(PermissionGroup::getPrefix).orElse("");
+        String name = group.map(PermissionGroup::getName).orElse("");
+        String suffix = group.map(PermissionGroup::getSuffix).orElse("");
+        String chatColor = "&" + group.map(PermissionGroup::getChatColor);
+
         String formatter = handler.getChatFormat(false);
-        String finalGroup = group.get().getPrefix() + group.get().getName() + group.get().getSuffix();
-        String color = "&" + group.get().getChatColor();
+        String finalGroup = prefix + name + suffix;
         return formatter.replace("{group}", finalGroup)
-                .replace("{username}", username).replace("{message}", color + message);
+                .replace("{username}", username).replace("{message}", chatColor + message);
     }
 
     /**

Spigot/src/main/java/me/innectic/permissify/spigot/events/PlayerChat.java

@@ -49,12 +49,8 @@ public void onPlayerChat(AsyncPlayerChatEvent e) {
         if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent()) return;
         Player player = e.getPlayer();
         if (player == null) return;
-        Optional<PermissionGroup> group = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().stream()
-                .filter(permissionGroup -> permissionGroup.hasPlayer(player.getUniqueId()))
-                .filter(permissionGroup -> permissionGroup.isPrimaryGroup(player.getUniqueId())).findFirst();
-        group.ifPresent(permissionGroup -> {
-            e.setCancelled(true);
-            Bukkit.broadcastMessage(ColorUtil.makeReadable(ChatFormatter.formatChat(player.getUniqueId(), player.getName(), e.getMessage())));
-        });
+        e.setCancelled(true);
+        String formatted = ChatFormatter.formatChat(player.getUniqueId(), player.getName(), e.getMessage());
+        Bukkit.broadcastMessage(ColorUtil.makeReadable(formatted));
     }
 }