[FIX] missing options

AyakoBot · Dec 23, 2023 · 68b8066 · 68b8066
1 parent 87eb1f1
commit 68b8066
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 35 deletions.
diff --git a/src/BaseClient/ClientHelperModules/mod.ts b/src/BaseClient/ClientHelperModules/mod.ts
@@ -52,80 +52,80 @@ export default async <T extends CT.ModTypes>(
 
  const runAction = async () => {
   switch (type) {
-   case 'banAdd':
+   case CT.ModTypes.BanAdd:
     return mod.banAdd(
      options as unknown as CT.ModOptions<CT.ModTypes.BanAdd>,
      language,
      message,
      cmd,
     );
-   case 'channelBanAdd':
+   case CT.ModTypes.ChannelBanAdd:
     return mod.channelBanAdd(
      options as unknown as CT.ModOptions<CT.ModTypes.ChannelBanAdd>,
      language,
      message,
      cmd,
     );
-   case 'softBanAdd':
+   case CT.ModTypes.SoftBanAdd:
     return mod.softBanAdd(
      options as unknown as CT.ModOptions<CT.ModTypes.SoftBanAdd>,
      language,
      message,
      cmd,
     );
-   case 'kickAdd':
+   case CT.ModTypes.KickAdd:
     return mod.kickAdd(options, language, message, cmd);
-   case 'tempBanAdd':
+   case CT.ModTypes.TempBanAdd:
     return mod.tempBanAdd(
      options as unknown as CT.ModOptions<CT.ModTypes.TempBanAdd>,
      language,
      message,
      cmd,
     );
-   case 'tempChannelBanAdd':
+   case CT.ModTypes.TempChannelBanAdd:
     return mod.tempChannelBanAdd(
      options as unknown as CT.ModOptions<CT.ModTypes.TempChannelBanAdd>,
      language,
      message,
      cmd,
     );
-   case 'tempMuteAdd':
+   case CT.ModTypes.TempMuteAdd:
     return mod.tempMuteAdd(
      options as unknown as CT.ModOptions<CT.ModTypes.TempMuteAdd>,
      language,
      message,
      cmd,
     );
-   case 'warnAdd':
+   case CT.ModTypes.WarnAdd:
     return mod.warnAdd();
-   case 'strikeAdd':
+   case CT.ModTypes.StrikeAdd:
     return mod.strikeAdd(options, language, message, cmd);
-   case 'softWarnAdd':
+   case CT.ModTypes.SoftWarnAdd:
     return mod.softWarnAdd();
-   case 'roleRemove':
+   case CT.ModTypes.RoleRemove:
     return mod.roleRemove(
      options as unknown as CT.ModOptions<CT.ModTypes.RoleRemove>,
      language,
      message,
      cmd,
     );
-   case 'roleAdd':
+   case CT.ModTypes.RoleAdd:
     return mod.roleAdd(
      options as unknown as CT.ModOptions<CT.ModTypes.RoleAdd>,
      language,
      message,
      cmd,
     );
-   case 'muteRemove':
+   case CT.ModTypes.MuteRemove:
     return mod.muteRemove(options, language, message, cmd);
-   case 'channelBanRemove':
+   case CT.ModTypes.ChannelBanRemove:
     return mod.channelBanRemove(
      options as unknown as CT.ModOptions<CT.ModTypes.ChannelBanRemove>,
      language,
      message,
      cmd,
     );
-   case 'banRemove':
+   case CT.ModTypes.BanRemove:
     return mod.banRemove(options, language, message, cmd);
    default: {
     throw new Error(`Unknown modType ${type}`);
@@ -144,7 +144,7 @@ export default async <T extends CT.ModTypes>(
   type = action.type as T;
  }
 
- if (type === 'strikeAdd') return;
+ if (type === CT.ModTypes.StrikeAdd) return;
 
  runBasics2(typeof action === 'boolean' ? options : action.options, message, language, type, cmd);
  cache.punishments.delete(options.target.id);

diff --git a/src/BaseClient/ClientHelperModules/mod/mod/strikeAdd.ts b/src/BaseClient/ClientHelperModules/mod/mod/strikeAdd.ts
@@ -1,3 +1,4 @@
+import Prisma from '@prisma/client';
 import * as CT from '../../../../Typings/Typings.js';
 
 import cache from '../../cache.js';
@@ -37,7 +38,7 @@ export default async <T extends CT.ModTypes>(
  }
 
  switch (strike.punishment) {
-  case 'ban': {
+  case Prisma.$Enums.AutoPunishPunishmentType.ban: {
    const opts = {
     ...options,
     deleteMessageSeconds:
@@ -50,7 +51,7 @@ export default async <T extends CT.ModTypes>(
     options: opts,
    };
   }
-  case 'channelban': {
+  case Prisma.$Enums.AutoPunishPunishmentType.channelban: {
    if (!cmd.channel) {
     error(cmd.guild, new Error('No Channel found in strikeAdd'));
     return { success: false, type: CT.ModTypes.StrikeAdd, options };
@@ -60,37 +61,30 @@ export default async <T extends CT.ModTypes>(
     ...options,
     deleteMessageSeconds:
      Number(strike.deletemessageseconds) > 604800 ? 604800 : Number(strike.deletemessageseconds),
+    channel: cmd.channel.isThread()
+     ? (cmd.channel.parent as NonNullable<typeof cmd.channel.parent>)
+     : cmd.channel,
    };
 
    return {
-    success: channelBanAdd(
-     {
-      ...options,
-      channel: cmd.channel.isThread()
-       ? (cmd.channel.parent as NonNullable<typeof cmd.channel.parent>)
-       : cmd.channel,
-     },
-     language,
-     message,
-     cmd,
-    ),
+    success: channelBanAdd(opts, language, message, cmd),
     type: CT.ModTypes.ChannelBanAdd,
     options: opts,
    };
   }
-  case 'kick':
+  case Prisma.$Enums.AutoPunishPunishmentType.kick:
    return {
     success: kickAdd(options, language, message, cmd),
     type: CT.ModTypes.KickAdd,
     options,
    };
-  case 'tempmute':
+  case Prisma.$Enums.AutoPunishPunishmentType.tempmute:
    return {
     success: tempMuteAdd({ ...options, duration: Number(strike.duration) }, language, message, cmd),
     type: CT.ModTypes.TempMuteAdd,
     options,
    };
-  case 'tempchannelban': {
+  case Prisma.$Enums.AutoPunishPunishmentType.tempchannelban: {
    if (!cmd.channel) {
     error(cmd.guild, new Error('No channel found in strikeAdd'));
     return { success: false, type: CT.ModTypes.StrikeAdd, options };
@@ -110,9 +104,9 @@ export default async <T extends CT.ModTypes>(
     options: opts,
    };
   }
-  case 'warn':
+  case Prisma.$Enums.AutoPunishPunishmentType.warn:
    return { success: warnAdd(), type: CT.ModTypes.WarnAdd, options };
-  case 'tempban': {
+  case Prisma.$Enums.AutoPunishPunishmentType.tempban: {
    const opts = {
     ...options,
     duration: Number(strike.duration) * 1000,
@@ -126,7 +120,7 @@ export default async <T extends CT.ModTypes>(
     options: opts,
    };
   }
-  case 'softban': {
+  case Prisma.$Enums.AutoPunishPunishmentType.softban: {
    const opts = {
     ...options,
     deleteMessageSeconds: