Don't allow permissions to be added / removed if they exist/don't

Author: Innectic

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

@@ -81,9 +81,9 @@ public class PermissifyConstants {
     public static final String PERMISSION_REMOVED_PLAYER = PERMISSIFY_PREFIX + "&e&lPermission <PERMISSION> has been removed from <PLAYER>!";
     public static final String PLAYER_ADDED_TO_GROUP = PERMISSIFY_PREFIX + "&e&lAdded <PLAYER> to <GROUP>";
     public static final String PLAYER_REMOVED_FROM_GROUP = PERMISSIFY_PREFIX + "&e&lRemoved <PLAYER> from <GROUP>";
-    public static final String FORMATTER_SET = PERMISSIFY_PREFIX + "&e&lFormatter <FORMATTER> set!";
     public static final String MAIN_GROUP_SET = PERMISSIFY_PREFIX + "&e&lSet main group for <PLAYER> to <GROUP>!";
-    public static final String TOGGLED_CHAT_HANDLE = PERMISSIFY_PREFIX + "&e&l<STATE> chat formatting.";
+    public static final String PLAYER_ALREADY_HAS_PERMISSION = PERMISSIFY_PREFIX + "&c&lPlayer <PLAYER> already has permission <PERMISSION>";
+    public static final String PLAYER_DOES_NOT_HAVE_PERMISSION = PERMISSIFY_PREFIX + "&c&lPlayer <PLAYER> does not have permission <PERMISSION>";
 
     public static final String EMPTY_DEFAULT_GROUP_NAME = "&c&lNONE";
     public static final String DEFAULT_GROUP_RESPONSE = PERMISSIFY_PREFIX + "&e&lThe current default group is '<GROUP>&e&l'.";

API/src/main/java/me/innectic/permissify/api/database/DatabaseHandler.java

@@ -121,10 +121,19 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      *
      * @param uuid       the uuid of the player to check
      * @param permission the permission to check
-     * @return           if the player has the permission
+     * @return           if the player has the permission, regardless of the granted status
      */
     public abstract boolean hasPermission(UUID uuid, String permission);
 
+    /**
+     * Does a player have a permission granted to them?
+     *
+     * @param uuid       the uuid of the player to check
+     * @param permission the permission to check for
+     * @return           if the player has the permission
+     */
+    public abstract boolean isGrantedPermission(UUID uuid, String permission);
+
     /**
      * Get the permissions of a uuid
      *

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

@@ -350,14 +350,15 @@ public void addPermission(UUID uuid, String... permissions) {
         List<Permission> playerPermissions = cachedPermissions.getOrDefault(uuid, new ArrayList<>());
 
         for (String permission : permissions) {
-            Permission perm = new Permission(permission, true);
-            playerPermissions.add(perm);
-
             Optional<Connection> connection = getConnection();
             if (!connection.isPresent()) {
                 PermissifyAPI.get().ifPresent(api -> api.getDisplayUtil().displayError(ConnectionError.REJECTED, Optional.empty()));
                 return;
             }
+
+            Permission perm = new Permission(permission, true);
+            playerPermissions.add(perm);
+
             try {
                 PreparedStatement statement = connection.get().prepareStatement("INSERT INTO playerPermissions (uuid,permission,granted) VALUES (?,?,?)");
                 statement.setString(1, uuid.toString());
@@ -392,14 +393,7 @@ public void removePermission(UUID uuid, String... permissions) {
                 PreparedStatement statement = connection.get().prepareStatement("DELETE FROM playerPermissions WHERE uuid=? AND permission=?");
                 statement.setString(1, uuid.toString());
                 statement.setString(2, permission);
-                statement.execute();
-                // Cleanup
-                statement.close();
-                statement = connection.get().prepareStatement("INSERT INTO playerPermissions (uuid,permission,granted) VALUES (?,?,?)");
-                statement.setString(1, uuid.toString());
-                statement.setString(2, permission);
-                statement.setBoolean(3, false);
-                // Cleanup
+
                 statement.execute();
                 statement.close();
                 connection.get().close();
@@ -410,7 +404,7 @@ public void removePermission(UUID uuid, String... permissions) {
     }
 
     @Override
-    public boolean hasPermission(UUID uuid, String permission) {
+    public boolean isGrantedPermission(UUID uuid, String permission) {
         // Check the cache first
         if (cachedPermissions.containsKey(uuid))
             return cachedPermissions.get(uuid).stream()
@@ -442,6 +436,11 @@ public boolean hasPermission(UUID uuid, String permission) {
         return false;
     }
 
+    @Override
+    public boolean hasPermission(UUID uuid, String permission) {
+        return cachedPermissions.containsKey(uuid) && cachedPermissions.get(uuid).stream().filter(entry -> entry.getPermission().equals(permission)).count() == 1;
+    }
+
     @Override
     public List<Permission> getPermissions(UUID uuid) {
         if (cachedPermissions.containsKey(uuid)) return cachedPermissions.get(uuid);

API/src/main/java/me/innectic/permissify/api/group/group/PermissionGroup.java

@@ -39,12 +39,13 @@
  */
 @RequiredArgsConstructor
 public class PermissionGroup {
-    @Getter private final String name;
-    @Getter private final String displayName;
-    @Getter private final String chatColor;
-    @Getter private final String prefix;
-    @Getter private final String suffix;
-    @NonNull @Getter @Setter private AbstractLadder ladder;
+    @Getter @NonNull private String name;
+    @Getter @NonNull private String displayName;
+    @Getter @NonNull private String chatColor;
+    @Getter @NonNull private String prefix;
+    @Getter @NonNull private String suffix;
+    @Getter @Setter @NonNull private AbstractLadder ladder;
+
     @Getter private List<Permission> permissions = new ArrayList<>();
     @Getter private Map<UUID, Boolean> players = new HashMap<>();
 

Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java

@@ -53,7 +53,6 @@ public class PermissifyMain extends JavaPlugin {
 
     @Getter private GroupCommand groupCommand;
     @Getter private PlayerCommand playerCommand;
-    @Getter private FormatCommand formatCommand;
     @Getter private CacheCommand cacheCommand;
     @Getter private ProfileCommand profileCommand;
 
@@ -125,7 +124,6 @@ public static PermissifyMain getInstance() {
     private void registerCommands() {
         groupCommand = new GroupCommand();
         playerCommand = new PlayerCommand();
-        formatCommand = new FormatCommand();
         cacheCommand = new CacheCommand();
         profileCommand = new ProfileCommand();
 

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

@@ -132,9 +132,6 @@ else if (args[1].equalsIgnoreCase("listgroups"))
                     return;
                 }
                 sendResponse(response, sender);
-            } else if (args[0].equalsIgnoreCase("format")) {
-                String response = plugin.getFormatCommand().handleSetFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
-                sender.sendMessage(ColorUtil.makeReadable(response));
             } else if (args[0].equalsIgnoreCase("profile")) {
                 String response = plugin.getProfileCommand().handleProfile(sender, ArgumentUtil.getRemainingArgs(1, args));
                 sender.sendMessage(ColorUtil.makeReadable(response));

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

@@ -136,6 +136,10 @@ public String handleAddPermission(CommandSender sender, String[] args) {
         OfflinePlayer targetPlayer = Bukkit.getPlayer(args[0]);
         if (targetPlayer == null || !targetPlayer.hasPlayedBefore()) return PermissifyConstants.INVALID_PLAYER;
 
+        if (plugin.getPermissifyAPI().getDatabaseHandler().get().hasPermission(targetPlayer.getUniqueId(), args[1])) {
+            // Player already has this permission.
+            return PermissifyConstants.PLAYER_ALREADY_HAS_PERMISSION.replace("<PLAYER>", targetPlayer.getName()).replace("<PERMISSION>", args[1]);
+        }
         plugin.getPermissifyAPI().getDatabaseHandler().get().addPermission(targetPlayer.getUniqueId(), args[1]);
         if (targetPlayer.isOnline()) targetPlayer.getPlayer().addAttachment(plugin, args[1], true);
 
@@ -174,6 +178,11 @@ public String handleRemovePermission(CommandSender sender, String[] args) {
 
         OfflinePlayer targetPlayer = Bukkit.getPlayer(args[0]);
         if (targetPlayer == null || !targetPlayer.hasPlayedBefore()) return PermissifyConstants.INVALID_PLAYER;
+        if (!plugin.getPermissifyAPI().getDatabaseHandler().get().hasPermission(targetPlayer.getUniqueId(), args[1])) {
+            // Player doesn't have this permission
+            return PermissifyConstants.PLAYER_DOES_NOT_HAVE_PERMISSION.replace("<PLAYER>", targetPlayer.getName()).replace("<PERMISSION>", args[1]);
+        }
+
         plugin.getPermissifyAPI().getDatabaseHandler().get().removePermission(targetPlayer.getUniqueId(), args[1]);
         if (targetPlayer.isOnline()) targetPlayer.getPlayer().addAttachment(plugin, args[1], false);
 
@@ -193,8 +202,6 @@ public String handleListGroups(CommandSender sender, String[] args) {
         if (args.length < 1) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER_LIST_GROUP;
 
         OfflinePlayer targetPlayer = Bukkit.getPlayer(args[0]);
-        System.out.println(args[0]);
-        System.out.println(targetPlayer.getName());
         if (targetPlayer == null || !targetPlayer.hasPlayedBefore()) return PermissifyConstants.INVALID_PLAYER;
 
         List<String> groups = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().entrySet().stream()

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

@@ -47,7 +47,7 @@ public static boolean hasPermissionOrSuperAdmin(CommandSender sender, String per
                     (PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().map(handler ->
                             handler.isSuperAdmin(player.getUniqueId())).orElse(false));
         }
-        return sender instanceof CommandBlock || sender instanceof ConsoleCommandSender; // XXX: Maybe we don't want command blocks here?
+        return sender instanceof CommandBlock || sender instanceof ConsoleCommandSender;
     }
 
     public static void applyPermissions(Player player) {