Add softBan and tempBan commands, enhance ModerationModule, and improve unban functionality

Author: Pdzly

src/modules/moderation/kick.command.ts

@@ -6,7 +6,7 @@ import {
 import { config } from "../../Config.js";
 import { actualMention, fakeMention } from "../../util/users.js";
 
-export const BanCommand: Command<ApplicationCommandType.ChatInput> = {
+export const KickCommand: Command<ApplicationCommandType.ChatInput> = {
   name: "kick",
   description: "Ban a baaaaad boy",
   type: ApplicationCommandType.ChatInput,

src/modules/moderation/moderation.module.ts

@@ -3,9 +3,18 @@ import { InviteListeners } from "./discordInvitesMonitor.module.js";
 import { BanCommand } from "./ban.command.js";
 import { UnbanCommand } from "./unban.command.js";
 import { TempBanListener } from "./tempBan.module.js";
+import { SoftBanCommand } from "./softBan.command.js";
+import { TempBanCommand } from "./tempBan.command.js";
+import { KickCommand } from "./kick.command.js";
 
 export const ModerationModule: Module = {
   name: "moderation",
-  commands: [BanCommand, UnbanCommand],
+  commands: [
+    BanCommand,
+    UnbanCommand,
+    SoftBanCommand,
+    TempBanCommand,
+    KickCommand,
+  ],
   listeners: [...InviteListeners, TempBanListener],
 };

src/modules/moderation/softBan.command.ts

@@ -7,8 +7,8 @@ import { config } from "../../Config.js";
 import { actualMention, fakeMention } from "../../util/users.js";
 
 export const SoftBanCommand: Command<ApplicationCommandType.ChatInput> = {
-  name: "ban",
-  description: "Ban a baaaaad boy",
+  name: "softban",
+  description: "Soft Ban a baaaaad boy",
   type: ApplicationCommandType.ChatInput,
   default_permission: false,
   options: [

src/modules/moderation/tempBan.command.ts

@@ -7,7 +7,7 @@ import { config } from "../../Config.js";
 import { actualMention, fakeMention } from "../../util/users.js";
 import { createTempBanModAction } from "./tempBan.js";
 
-export const SoftBanCommand: Command<ApplicationCommandType.ChatInput> = {
+export const TempBanCommand: Command<ApplicationCommandType.ChatInput> = {
   name: "tempban",
   description: "Temp Ban a baaaaad boy",
   type: ApplicationCommandType.ChatInput,
@@ -19,17 +19,18 @@ export const SoftBanCommand: Command<ApplicationCommandType.ChatInput> = {
       description: "The user to be banned",
       required: true,
     },
-    {
-      type: ApplicationCommandOptionType.String,
-      name: "reason",
-      description: "The reason why the user gets banned",
-    },
     {
       type: ApplicationCommandOptionType.Number,
       name: "ban_duration_days",
       description: "The duration of the ban in days",
       required: true,
     },
+    {
+      type: ApplicationCommandOptionType.String,
+      name: "reason",
+      description: "The reason why the user gets banned",
+    },
+
     {
       type: ApplicationCommandOptionType.Boolean,
       name: "delete_messages",

src/modules/moderation/unban.command.ts

@@ -5,6 +5,7 @@ import {
 } from "discord.js";
 import { config } from "../../Config.js";
 import { actualMention, fakeMention } from "../../util/users.js";
+import { getActiveTempBanModAction } from "./tempBan.js";
 
 export const UnbanCommand: Command<ApplicationCommandType.ChatInput> = {
   name: "unban",
@@ -41,6 +42,9 @@ export const UnbanCommand: Command<ApplicationCommandType.ChatInput> = {
 
       await interaction.guild.bans.remove(user.id, reason ?? undefined);
 
+      const modAction = await getActiveTempBanModAction(BigInt(user.id));
+      if (modAction) await modAction.destroy();
+
       const auditLogChannel = await interaction.guild.channels.fetch(
         config.channels.auditLog,
       );

src/store/storage.ts

@@ -7,6 +7,7 @@ import { AbstractDialect, DialectName, Sequelize } from "@sequelize/core";
 import { SqliteDialect } from "@sequelize/sqlite3";
 import { ConnectionConfig } from "pg";
 import { Bump } from "./models/Bump.js";
+import { ModeratorActions } from "./models/ModeratorActions.js";
 
 function sequelizeLog(sql: string, timing?: number) {
   if (timing) {
@@ -54,7 +55,7 @@ export async function initStorage() {
   }
   await sequelize.authenticate();
 
-  const models = [DDUser, ColourRoles, FAQ, Bump];
+  const models = [DDUser, ColourRoles, FAQ, Bump, ModeratorActions];
   sequelize.addModels(models);
 
   Bump.belongsTo(DDUser, {