Allow superadmin revoking

Author: Innectic

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

@@ -106,6 +106,9 @@ public class PermissifyConstants {
     public static final String NOT_ENOUGH_ARGUMENTS_PROFILE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile [save|load] [profile]";
     public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_SAVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile save [fileName]";
     public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_LOAD = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile load [source]";
+    public static final String NOT_ENOUGH_ARGUMENTS_SUPERADMIN = PERMISSIFY_PREFIX + "&c&l/Not enough arguments! &e&l/permissify superadmin <grant|remove> <player>";
+    public static final String NOT_ENOUGH_ARGUMENTS_SUPERADMIN_GRANT = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify superadmin grant <player>";
+    public static final String NOT_ENOUGH_ARGUMENTS_SUPERADMIN_REMOVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify superadmin remove <player>";
 
     public static final String PROFILE_SAVED = PERMISSIFY_PREFIX + "&e&lSaved profile '<PROFILE>'.";
     public static final String PROFILE_NOT_SAVED = PERMISSIFY_PREFIX + "&c&lUnable to save profile '<PROFILE>'";
@@ -132,7 +135,8 @@ public class PermissifyConstants {
 
     public static final List<List<String>> PERMISSIFY_HELP_PAGES = new ArrayList<>(Arrays.asList(Arrays.asList(
             "&a&l/permissify help [page]",
-            "&a&l/permissify superadmin <player> - &c&lWARNING: &e&lSUPERADMIN GIVES PERMISSION FOR EVERYTHING!",
+            "&a&l/permissify superadmin grant <player> - &c&lWARNING: &e&lSUPERADMIN GIVES PERMISSION FOR EVERYTHING!",
+            "&a&l/permissify superadmin remove <player>",
             "&a&l/permissify cache",
             "&a&l/permissify cache purge",
             "&a&l/permissify group create <name> <display_name> <prefix> <suffix> <chatcolor>",

API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java

@@ -719,6 +719,7 @@ public boolean hasGroupPermission(String group, String permission) {
     @Override
     public void addSuperAdmin(UUID uuid) {
         if (uuid == null) return;
+        if (superAdmins.contains(uuid)) return;
         // Update the cache
         superAdmins.add(uuid);
         // Update mysql
@@ -746,7 +747,24 @@ public boolean isSuperAdmin(UUID uuid) {
 
     @Override
     public void removeSuperAdmin(UUID uuid) {
-        // TODO: Before 1.0.1
+        if (uuid == null) return;
+        superAdmins.removeIf(u -> u.equals(uuid));
+
+        Optional<Connection> connection = getConnection();
+        if (!connection.isPresent()) {
+            PermissifyAPI.get().ifPresent(api -> api.getDisplayUtil().displayError(ConnectionError.REJECTED, Optional.empty()));
+            return;
+        }
+        try {
+            PreparedStatement statement = connection.get().prepareStatement("DELETE FROM superAdmin WHERE uuid=?");
+            statement.setString(1, uuid.toString());
+            statement.execute();
+            statement.close();
+            connection.get().close();
+        } catch (SQLException e) {
+            PermissifyAPI.get().ifPresent(api -> api.getDisplayUtil().displayError(ConnectionError.DATABASE_EXCEPTION, Optional.of(e)));
+            e.printStackTrace();
+        }
     }
 
     @Override

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

@@ -54,11 +54,24 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
                 return;
             }
             if (sender instanceof ConsoleCommandSender) {
-                if (args.length >= 2 && args[0].equalsIgnoreCase("superadmin")) {
-                    Player player = Bukkit.getPlayer(args[1]);
-                    if (player == null) return;
-                    plugin.getPermissifyAPI().getDatabaseHandler().get().addSuperAdmin(player.getUniqueId());
-                    return;
+                if (args[0].equalsIgnoreCase("superadmin")) {
+                    if (args.length < 3) {
+                        sender.sendMessage(ColorUtil.makeReadable(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SUPERADMIN));
+                        return;
+                    }
+                    Player player = Bukkit.getPlayer(args[2]);
+                    if (player == null || !player.isOnline()) return;
+
+                    if (args[1].equalsIgnoreCase("grant")) {
+                        plugin.getPermissifyAPI().getDatabaseHandler().get().addSuperAdmin(player.getUniqueId());
+                        return;
+                    } else if (args[1].equalsIgnoreCase("remove")) {
+                        plugin.getPermissifyAPI().getDatabaseHandler().get().removeSuperAdmin(player.getUniqueId());
+                        return;
+                    } else {
+                        sender.sendMessage(ColorUtil.makeReadable(PermissifyConstants.INVALID_ARGUMENT.replace("<ARGUMENT>", args[1])));
+                        return;
+                    }
                 }
             }
             if (sender instanceof CommandBlock && !plugin.getConfig().getBoolean("allow-command-block", false)) return;