feat: permissions-based commands

Author: sylv256

src/main/java/net/modgarden/gardenbot/GardenBotEvents.java

@@ -29,6 +29,7 @@
 import net.modgarden.gardenbot.interaction.dispatcher.ButtonDispatcher;
 import net.modgarden.gardenbot.interaction.dispatcher.ModalDispatcher;
 import net.modgarden.gardenbot.interaction.dispatcher.SlashCommandDispatcher;
+import net.modgarden.gardenbot.response.Response;
 import net.modgarden.gardenbot.util.MessageCacheUtil;
 import net.modgarden.gardenbot.util.SchedulerUtil;
 import org.jetbrains.annotations.NotNull;
@@ -38,7 +39,14 @@
 public class GardenBotEvents extends ListenerAdapter {
 	@Override
 	public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
-		var response = SlashCommandDispatcher.dispatch(new SlashCommandInteraction(event));
+		Response response;
+		try {
+			response = SlashCommandDispatcher.dispatch(new SlashCommandInteraction(event));
+		} catch (HypertextException e) {
+			GardenBot.LOG.error("", e);
+			return;
+		}
+
 		response.replyToSlashCommand(event).queue();
 	}
 
@@ -60,7 +68,14 @@ public void onButtonInteraction(@NotNull ButtonInteractionEvent event) {
 
 	@Override
 	public void onModalInteraction(@NotNull ModalInteractionEvent event) {
-		var response = ModalDispatcher.dispatch(new ModalInteraction(event));
+		Response response;
+		try {
+			response = ModalDispatcher.dispatch(new ModalInteraction(event));
+		} catch (HypertextException e) {
+			GardenBot.LOG.error("", e);
+			return;
+		}
+
 		response.replyToModal(event).queue();
 	}
 

src/main/java/net/modgarden/gardenbot/client/mod_garden/user/ModGardenUser.java

@@ -5,6 +5,7 @@
 public record ModGardenUser(
 		String id,
 		String username,
+		String permissions,
 		List<String> events,
 		List<String> projects,
 		List<String> roles,

src/main/java/net/modgarden/gardenbot/command/admin/AdminSlashCommand.java

@@ -2,25 +2,44 @@
 
 import net.dv8tion.jda.api.entities.Role;
 import net.modgarden.gardenbot.GardenBot;
+import net.modgarden.gardenbot.client.ModGarden;
+import net.modgarden.gardenbot.client.exception.HypertextException;
+import net.modgarden.gardenbot.client.mod_garden.user.ModGardenUser;
 import net.modgarden.gardenbot.command.SlashCommand;
 import net.modgarden.gardenbot.command.SlashCommandOption;
 import net.modgarden.gardenbot.interaction.SlashCommandInteraction;
 import net.modgarden.gardenbot.response.MessageResponse;
 import net.modgarden.gardenbot.response.Response;
+import net.modgarden.gardenbot.util.permission.PermissionPredicate;
+import net.modgarden.gardenbot.util.permission.Permissions;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 import static net.modgarden.gardenbot.GardenBot.IS_DEV_ENV;
 import static net.modgarden.gardenbot.command.sudo.SudoCommand.SUDO_ROLE_ID;
 
 public abstract class AdminSlashCommand extends SlashCommand {
-
 	public AdminSlashCommand(String name, String description, SlashCommandOption... options) {
 		super(name, description, options);
 	}
 
+	protected @Nullable PermissionPredicate requiredPermissions() {
+		return null;
+	}
+
 	@Override
-	public final Response respondInternal(SlashCommandInteraction interaction) {
+	public final Response respondInternal(SlashCommandInteraction interaction) throws HypertextException {
+		PermissionPredicate permissionPredicate = this.requiredPermissions();
+
+		if (permissionPredicate != null && interaction.event().getMember() != null) {
+			ModGardenUser user = ModGarden.getUserByDiscordUser(interaction.event().getUser());
+
+			if (user != null) {
+				permissionPredicate.test(new Permissions(user.permissions()));
+			}
+		}
+
 		if (interaction.event().getMember() == null || !hasPermission(interaction.event().getMember().getRoles())) {
 			return new MessageResponse("You do not have the permissions to execute this command.");
 		}

src/main/java/net/modgarden/gardenbot/command/admin/event/AdminAddEventRoleCommand.java

@@ -32,7 +32,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class AdminAddEventRoleCommand extends AdminSlashCommand {
+public class AdminAddEventRoleCommand extends AdminEventSlashCommand {
 	public AdminAddEventRoleCommand() {
 		super(
 				"add_role",

src/main/java/net/modgarden/gardenbot/command/admin/event/AdminEventCreateCommand.java

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class AdminEventCreateCommand extends AdminSlashCommand {
+public class AdminEventCreateCommand extends AdminEventSlashCommand {
 	public AdminEventCreateCommand() {
 		super(
 				"create",

src/main/java/net/modgarden/gardenbot/command/admin/event/AdminEventSlashCommand.java

@@ -0,0 +1,23 @@
+package net.modgarden.gardenbot.command.admin.event;
+
+import net.modgarden.gardenbot.command.SlashCommandOption;
+import net.modgarden.gardenbot.command.admin.AdminSlashCommand;
+import net.modgarden.gardenbot.util.permission.Permission;
+import net.modgarden.gardenbot.util.permission.PermissionPredicate;
+import org.jetbrains.annotations.Nullable;
+
+public abstract class AdminEventSlashCommand extends AdminSlashCommand {
+	public AdminEventSlashCommand(
+			String name,
+			String description,
+			SlashCommandOption... options
+	) {
+		super(name, description, options);
+	}
+
+	@Nullable
+	@Override
+	protected PermissionPredicate requiredPermissions() {
+		return PermissionPredicate.all(Permission.EDIT_EVENT);
+	}
+}

src/main/java/net/modgarden/gardenbot/command/admin/event/AdminListEventRolesCommand.java

@@ -22,9 +22,12 @@
 import net.modgarden.gardenbot.response.EmbedResponse;
 import net.modgarden.gardenbot.response.MessageResponse;
 import net.modgarden.gardenbot.response.Response;
+import net.modgarden.gardenbot.util.permission.Permission;
+import net.modgarden.gardenbot.util.permission.PermissionPredicate;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class AdminListEventRolesCommand extends AdminSlashCommand {
+public class AdminListEventRolesCommand extends AdminEventSlashCommand {
 	public AdminListEventRolesCommand() {
 		super(
 				"list_roles",
@@ -96,4 +99,10 @@ public List<Command.Choice> getAutoCompleteChoices(String focusedOption, User us
 		// TODO: This...
 		return Collections.emptyList();
 	}
+
+	@Nullable
+	@Override
+	protected PermissionPredicate requiredPermissions() {
+		return PermissionPredicate.any(Permission.LIST_USER_INFO, Permission.EDIT_EVENT);
+	}
 }

src/main/java/net/modgarden/gardenbot/command/admin/event/AdminModifyEventCommand.java

@@ -32,7 +32,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class AdminModifyEventCommand extends AdminSlashCommand {
+public class AdminModifyEventCommand extends AdminEventSlashCommand {
 	public AdminModifyEventCommand() {
 		super(
 				"modify",

src/main/java/net/modgarden/gardenbot/command/admin/event/AdminRemoveEventRoleCommand.java

@@ -24,7 +24,7 @@
 import net.modgarden.gardenbot.util.NullableWrapper;
 import org.jetbrains.annotations.NotNull;
 
-public class AdminRemoveEventRoleCommand extends AdminSlashCommand {
+public class AdminRemoveEventRoleCommand extends AdminEventSlashCommand {
 	public AdminRemoveEventRoleCommand() {
 		super(
 				"remove_role",

src/main/java/net/modgarden/gardenbot/command/admin/role/AdminRoleAddUserCommand.java

@@ -1,5 +1,7 @@
 package net.modgarden.gardenbot.command.admin.role;
 
+import static net.modgarden.gardenbot.command.admin.role.AdminRoleRemoveUserCommand.checkRoleAbility;
+
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Objects;
@@ -24,7 +26,7 @@
 import net.modgarden.gardenbot.response.Response;
 import org.jetbrains.annotations.NotNull;
 
-public class AdminRoleAddUserCommand extends AdminSlashCommand {
+public class AdminRoleAddUserCommand extends AdminRoleSlashCommand {
 	public AdminRoleAddUserCommand() {
 		super(
 				"add_user",
@@ -99,6 +101,9 @@ public Response respond(SlashCommandInteraction interaction) throws HypertextExc
 			throw new BadRequestException("No user was specified");
 		}
 
+		MessageResponse x = checkRoleAbility(interaction, role);
+		if (x != null) return x;
+
 		ModGarden.addUserRole(user, role);
 
 		if (discordUser != null && role.integrations().discord() != null) {