Split moderation commands into their own module

config/src/main/groovy/net/neoforged/camelot/config/module/Moderation.groovy

@@ -0,0 +1,20 @@
+package net.neoforged.camelot.config.module
+
+import groovy.transform.CompileStatic
+
+/**
+ * The module that provides moderation commands.
+ * <p>
+ * The commands included in this module are:
+ * <ul>
+ *     <li>{@code /warn add}, {@code /warn delete}</li>
+ *     <li>{@code /note add}, {@code /note remove}</li>
+ *     <li>{@code /mute}, {@code /unmute}</li>
+ *     <li>{@code /ban}, {@code /unban}</li>
+ *     <li>{@code /kick}</li>
+ *     <li>{@code /purge}</li>
+ * </ul>
+ */
+@CompileStatic
+class Moderation extends ModuleConfiguration {
+}

config/src/main/groovy/net/neoforged/camelot/config/module/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * The package containing the configurations of all Camelot modules.
+ */
+package net.neoforged.camelot.config.module;

src/main/java/net/neoforged/camelot/commands/Commands.java

@@ -52,22 +52,8 @@ public static void init() {
                 .addSlashCommand(new PingCommand())
                 .addSlashCommand(new HelpCommand(BotMain.BUTTON_MANAGER))
 
-                // Moderation commands
-                .addSlashCommands(
-                        new ModLogsCommand(BotMain.BUTTON_MANAGER),
-                        new NoteCommand(), new WarnCommand(),
-                        new MuteCommand(), new UnmuteCommand(),
-                        new KickCommand(), new PurgeCommand(),
-                        new BanCommand(), new UnbanCommand()
-                )
-
                 // Information commands
-                .addSlashCommands(RuleCommand.INSTANCE, new McAgeCommand(), new VersioningCommand(), new ConfigurationCommand())
-
-                .addCommand(RuleCommand.INSTANCE)
-
-                // Message context menus
-                .addContextMenus(new InfoChannelCommand.UploadToDiscohookContextMenu());
+                .addSlashCommands(new McAgeCommand(), new VersioningCommand(), new ConfigurationCommand());
 
         BotMain.forEachModule(module -> module.registerCommands(builder));
 

src/main/java/net/neoforged/camelot/configuration/ConfigMigrator.java

@@ -56,7 +56,7 @@ public String migrate(Properties properties) {
                 script.appendLine("auth = appAuthentication {").indent();
                 script.appendProperty("appId", properties.getProperty("githubAppId"));
                 script.appendLine("privateKey = secret(readFile('github.pem'))");
-                script.appendLine("installation = organization(" + escape(properties.getProperty("githubInstallationOwner", "")) + ")");
+                script.appendLine("installation = organization('" + escape(properties.getProperty("githubInstallationOwner", "")) + "')");
                 script.indentEnd().appendLine("}");
             } else {
                 if (!properties.getProperty("githubPAT", "").isBlank()) {

src/main/java/net/neoforged/camelot/module/BanAppealModule.java

@@ -397,7 +397,7 @@ private void onModal(ModalInteractionEvent event) {
                         .flatMap(_ -> closeAppeal(thread, true))
                         .flatMap(_ -> retrieveUser)
                         .onSuccess(user -> sendMailFromServer(appeal.email(), user, guild, "Ban appeal rejected",
-                                pre(text("You appeal has been "), b(text("rejected")), text(".")),
+                                pre(text("Your appeal has been "), b(text("rejected")), text(".")),
                                 pre(text("You may appeal again in "), b(text(blockDaysStr)), text(" days.")),
                                 hr(),
                                 h5("Reason"),
@@ -453,7 +453,7 @@ private void onButton(ButtonInteractionEvent event) {
                                 .setMaxUses(1).setMaxAge((long) 7, TimeUnit.DAYS)
                                 .reason("Un-ban invite for " + userId)
                                 .onSuccess(invite -> sendMailFromServer(appeal.email(), user, event.getGuild(), "Ban appeal approved",
-                                        pre(text("You appeal has been "), b(text("approved")), text(".")),
+                                        pre(text("Your appeal has been "), b(text("approved")), text(".")),
                                         pre(text("You may join the server again using "), a("this invite link").withHref(invite.getUrl()), text(" which expires in 7 days."))
                                 )))
                         .onSuccess(_ -> Database.appeals().useExtension(BanAppealsDAO.class, db -> db.deleteAppeal(appeal.guildId(), appeal.userId())))

src/main/java/net/neoforged/camelot/module/InfoChannelsModule.java

@@ -5,6 +5,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.neoforged.camelot.BotMain;
 import net.neoforged.camelot.commands.information.InfoChannelCommand;
+import net.neoforged.camelot.commands.information.RuleCommand;
 import net.neoforged.camelot.config.module.InfoChannels;
 
 import java.util.concurrent.TimeUnit;
@@ -30,7 +31,10 @@ public boolean shouldLoad() {
 
     @Override
     public void registerCommands(CommandClientBuilder builder) {
-        builder.addSlashCommand(new InfoChannelCommand());
+        builder.addSlashCommand(new InfoChannelCommand())
+                .addSlashCommand(RuleCommand.INSTANCE)
+                .addCommand(RuleCommand.INSTANCE)
+                .addContextMenu(new InfoChannelCommand.UploadToDiscohookContextMenu());
     }
 
     @Override

src/main/java/net/neoforged/camelot/module/ModerationModule.java

@@ -0,0 +1,41 @@
+package net.neoforged.camelot.module;
+
+import com.google.auto.service.AutoService;
+import com.jagrosh.jdautilities.command.CommandClientBuilder;
+import net.neoforged.camelot.BotMain;
+import net.neoforged.camelot.commands.moderation.BanCommand;
+import net.neoforged.camelot.commands.moderation.KickCommand;
+import net.neoforged.camelot.commands.moderation.ModLogsCommand;
+import net.neoforged.camelot.commands.moderation.MuteCommand;
+import net.neoforged.camelot.commands.moderation.NoteCommand;
+import net.neoforged.camelot.commands.moderation.PurgeCommand;
+import net.neoforged.camelot.commands.moderation.UnbanCommand;
+import net.neoforged.camelot.commands.moderation.UnmuteCommand;
+import net.neoforged.camelot.commands.moderation.WarnCommand;
+import net.neoforged.camelot.config.module.Moderation;
+
+/**
+ * The module that provides moderation commands.
+ */
+@AutoService(CamelotModule.class)
+public class ModerationModule extends CamelotModule.Base<Moderation> {
+    public ModerationModule() {
+        super(Moderation.class);
+    }
+
+    @Override
+    public String id() {
+        return "moderation";
+    }
+
+    @Override
+    public void registerCommands(CommandClientBuilder builder) {
+        builder.addSlashCommands(
+                new ModLogsCommand(BotMain.BUTTON_MANAGER),
+                new NoteCommand(), new WarnCommand(),
+                new MuteCommand(), new UnmuteCommand(),
+                new KickCommand(), new PurgeCommand(),
+                new BanCommand(), new UnbanCommand()
+        );
+    }
+}