Added the start of permission system...

Author: RealMangorage

src/main/java/org/mangorage/mangobotcore/api/command/v1/AbstractCommand.java

@@ -38,6 +38,9 @@ public String getDescription() {
     }
 
     public abstract R getFailedResult();
+    public abstract R getNoPermission();
+
+    public abstract PermissionNode<C> getPermissionNode();
 
     public List<String> aliases() {
         return List.of();
@@ -143,7 +146,11 @@ public R execute(CommandContext<C> ctx) {
                     result.addMessage("Not enough arguments! Required: " + requiredArgs + ", Provided: 0");
                     return getFailedResult();
                 }
-                return run(ctx);
+                if (getPermissionNode().hasPermission(ctx)) {
+                    return run(ctx);
+                } else {
+                    return getNoPermission();
+                }
             }
 
             String name = ctx.peek();
@@ -161,7 +168,11 @@ public R execute(CommandContext<C> ctx) {
                 return getFailedResult();
             }
 
-            return run(ctx);
+            if (getPermissionNode().hasPermission(ctx)) {
+                return run(ctx);
+            } else {
+                return getNoPermission();
+            }
         } catch (Throwable t) {
             result.addMessage(t.toString());
             return getFailedResult();

src/main/java/org/mangorage/mangobotcore/api/command/v1/PermissionNode.java

@@ -0,0 +1,6 @@
+package org.mangorage.mangobotcore.api.command.v1;
+
+public interface PermissionNode<C> {
+    String getId();
+    boolean hasPermission(CommandContext<C> commandContext);
+}

src/main/java/org/mangorage/mangobotcore/api/jda/command/v2/AbstractJDACommand.java

@@ -24,6 +24,11 @@ public final JDACommandResult getFailedResult() {
         return JDACommandResult.ERROR;
     }
 
+    @Override
+    public JDACommandResult getNoPermission() {
+        return JDACommandResult.NO_PERMISSION;
+    }
+
     @Override
     public JDACommandResult execute(CommandContext<Message> commandContext) {
         final var context = commandContext.getContextObject();
@@ -34,10 +39,6 @@ public JDACommandResult execute(CommandContext<Message> commandContext) {
         if (getCommandType() == JDACommandType.DM && context.isFromGuild())
             return JDACommandResult.DM_ONLY;
 
-        if (!hasPermission(context)) {
-            return JDACommandResult.NO_PERMISSION;
-        }
-
         // Continue with normal execution
         return super.execute(commandContext);
     }

src/main/java/org/mangorage/mangobotcore/api/jda/command/v2/JDAPermissionNode.java

@@ -0,0 +1,83 @@
+package org.mangorage.mangobotcore.api.jda.command.v2;
+
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.Role;
+import org.mangorage.mangobotcore.api.command.v1.CommandContext;
+import org.mangorage.mangobotcore.api.command.v1.PermissionNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class JDAPermissionNode implements PermissionNode<Message> {
+
+    record GuildUser(Long guildId, Long userId) {}
+    record GuildRole(Long guildId, Long roleId) {}
+
+    public static JDAPermissionNode create(String id) {
+        return new JDAPermissionNode(id);
+    }
+
+    private final String id;
+    private final List<GuildRole> roleIds = new ArrayList<>();
+    private final List<GuildUser> userIds = new ArrayList<>();
+    private final List<Permission> requiredDiscordPermissions = new ArrayList<>();
+
+    private JDAPermissionNode(String id) {
+        this.id = id;
+    }
+
+    public void authorizeGuildUser(Member member) {
+        userIds.add(new GuildUser(member.getGuild().getIdLong(), member.getUser().getIdLong()));
+    }
+
+    public void revokeGuildUser(Member member) {
+        userIds.remove(new GuildUser(member.getGuild().getIdLong(), member.getIdLong()));
+    }
+
+    public void addRequiredPermission(Permission permission) {
+        requiredDiscordPermissions.add(permission);
+    }
+
+    public void removeRequiredPermission(Permission permission) {
+        requiredDiscordPermissions.remove(permission);
+    }
+
+    public void authoriseRoleId(Long guildId, Long roleId) {
+        roleIds.add(new GuildRole(guildId, roleId));
+    }
+
+    public void revokeRoleId(Long guildId, Long roleId) {
+        roleIds.remove(new GuildRole(guildId, roleId));
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public boolean hasPermission(CommandContext<Message> commandContext) {
+        final var isGuild = commandContext.getContextObject().isFromGuild();
+        if (isGuild) {
+            final var member = commandContext.getContextObject().getMember();
+            if (member == null) {
+                return false;
+            }
+            final var guildId = member.getGuild().getIdLong();
+
+            if (roleIds.isEmpty() && userIds.isEmpty() && requiredDiscordPermissions.isEmpty()) {
+                return member.hasPermission(Permission.ADMINISTRATOR);
+            } else {
+                for (Role role : member.getRoles()) {
+                    if (roleIds.contains(new GuildRole(guildId, role.getIdLong())))
+                        return true;
+                }
+                return userIds.contains(new GuildUser(guildId, member.getIdLong()));
+            }
+        } else {
+            return userIds.isEmpty() || userIds.contains(new GuildUser(null, commandContext.getContextObject().getAuthor().getIdLong()));
+        }
+    }
+}