Merge pull request #19 from Innectic/fix/command-syntax

Fix/command syntax

Author: Innectic

API/src/main/java/me/innectic/permissify/api/PermissifyConstants.java

@@ -68,6 +68,7 @@ public class PermissifyConstants {
     public static final String GROUP_LIST = PERMISSIFY_PREFIX + "&e&lRegistered groups: <GROUPS>";
     public static final String PLAYER_GROUP_LIST = PERMISSIFY_PREFIX + "&e&lGroups for <PLAYER>: <GROUPS>";
     public static final String CACHE_PURGED = PERMISSIFY_PREFIX + "&e&lCache has been purged!";
+    public static final String CACHE_INFORMATION = PERMISSIFY_PREFIX + "&e&lCached groups: <GROUPS>, cached permissions: <PERMISSIONS>, default group: <DEFAULT>";
 
     public static final String PERMISSION_ADDED_GROUP = PERMISSIFY_PREFIX + "&e&lPermission <PERMISSION> has been added to <GROUP>!";
     public static final String PERMISSION_REMOVED_GROUP = PERMISSIFY_PREFIX + "&e&lPermission <PERMISSION> has been removed from <GROUP>!";

Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/CacheCommand.java

@@ -52,9 +52,10 @@ public CommandResponse handleCache(CommandSender sender, String[] args) {
             return new CommandResponse(PermissifyConstants.UNABLE_OTHER.replace("<REASON>", "No database handler"), false);
         // Show information about the current cache
         DatabaseHandler handler = PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get();
-        String cacheInformation = String.format("Cached groups: %d, cached permissions: %d, default group: %s", handler.getCachedGroups().size(),
-                handler.getCachedPermissions().size(), handler.getDefaultGroup().map(PermissionGroup::getName).orElse("NONE"));
-        return new CommandResponse(cacheInformation, false);
+        String response = PermissifyConstants.CACHE_INFORMATION.replace("<GROUPS>", Integer.toString(handler.getCachedGroups().size()))
+                .replace("<PERMISSIONS>", Integer.toString(handler.getCachedPermissions().size()))
+                .replace("<DEFAULT>", handler.getDefaultGroup().map(PermissionGroup::getName).orElse(PermissifyConstants.EMPTY_DEFAULT_GROUP_NAME));
+        return new CommandResponse(response, false);
     }
 
     private CommandResponse handleCachePurge(CommandSender sender, String[] args) {

Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/PlayerCommand.java

@@ -46,9 +46,6 @@
  */
 public class PlayerCommand {
 
-    // TODO: All of these should be unified to the same format:
-    // [player] [args...]
-
     public CommandResponse handleAddPlayerToGroup(CommandSender sender, String[] args) {
         PermissifyMain plugin = PermissifyMain.getInstance();
         if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
@@ -115,13 +112,13 @@ public CommandResponse handleAddPermission(CommandSender sender, String[] args)
         if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_PLAYER_PERMISSION_ADD))
             return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
         if (args.length < 2) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER_ADD_PERMISSION, false);
-        OfflinePlayer targetPlayer = Bukkit.getPlayer(args[1]);
+        OfflinePlayer targetPlayer = Bukkit.getPlayer(args[0]);
         if (targetPlayer == null || !targetPlayer.hasPlayedBefore()) return new CommandResponse(PermissifyConstants.INVALID_PLAYER, false);
-        plugin.getPermissifyAPI().getDatabaseHandler().get().addPermission(targetPlayer.getUniqueId(), args[0]);
-        if (targetPlayer.isOnline()) targetPlayer.getPlayer().addAttachment(plugin, args[0], true);
+        plugin.getPermissifyAPI().getDatabaseHandler().get().addPermission(targetPlayer.getUniqueId(), args[1]);
+        if (targetPlayer.isOnline()) targetPlayer.getPlayer().addAttachment(plugin, args[1], true);
         plugin.getPermissifyAPI().getDatabaseHandler().get().updateCache(targetPlayer.getUniqueId());
         return new CommandResponse(PermissifyConstants.PERMISSION_ADDED_PLAYER
-                .replace("<PLAYER>", targetPlayer.getName()).replace("<PERMISSION>", args[0]), true);
+                .replace("<PLAYER>", targetPlayer.getName()).replace("<PERMISSION>", args[1]), true);
     }
 
     public CommandResponse handleRemovePermission(CommandSender sender, String[] args) {
@@ -131,13 +128,13 @@ public CommandResponse handleRemovePermission(CommandSender sender, String[] arg
         if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_PLAYER_PERMISSION_REMOVE))
             return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
         if (args.length < 2) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER_REMOVE_PERMISSION, false);
-        OfflinePlayer targetPlayer = Bukkit.getPlayer(args[1]);
+        OfflinePlayer targetPlayer = Bukkit.getPlayer(args[0]);
         if (targetPlayer == null || !targetPlayer.hasPlayedBefore()) return new CommandResponse(PermissifyConstants.INVALID_PLAYER, false);
-        plugin.getPermissifyAPI().getDatabaseHandler().get().removePermission(targetPlayer.getUniqueId(), args[0]);
-        if (targetPlayer.isOnline()) targetPlayer.getPlayer().addAttachment(plugin, args[0], false);
+        plugin.getPermissifyAPI().getDatabaseHandler().get().removePermission(targetPlayer.getUniqueId(), args[1]);
+        if (targetPlayer.isOnline()) targetPlayer.getPlayer().addAttachment(plugin, args[1], false);
         plugin.getPermissifyAPI().getDatabaseHandler().get().updateCache(targetPlayer.getUniqueId());
         return new CommandResponse(PermissifyConstants.PERMISSION_REMOVED_PLAYER
-                .replace("<PLAYER>", targetPlayer.getName()).replace("<PERMISSION>", args[0]), true);
+                .replace("<PLAYER>", targetPlayer.getName()).replace("<PERMISSION>", args[1]), true);
     }
 
     public CommandResponse handleListGroups(CommandSender sender, String[] args) {