Updated Command Types

src/commands/moderation/ban.ts

@@ -1,19 +1,14 @@
 import {
-  CommandInteraction,
   PermissionsBitField,
   SlashCommandBuilder,
-  SlashCommandOptionsOnlyBuilder,
 } from 'discord.js';
+
 import { updateMember, updateMemberModerationHistory } from '../../db/db.js';
 import { parseDuration, scheduleUnban } from '../../util/helpers.js';
+import { OptionsCommand } from '../../types/CommandTypes.js';
 import logAction from '../../util/logging/logAction.js';
 
-interface Command {
+const command: OptionsCommand = {
-  data: SlashCommandOptionsOnlyBuilder;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
-
-const command: Command = {
   data: new SlashCommandBuilder()
     .setName('ban')
     .setDescription('Ban a member from the server')

src/commands/moderation/unban.ts

@@ -1,17 +1,9 @@
-import {
+import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
-  CommandInteraction,
+
-  PermissionsBitField,
-  SlashCommandBuilder,
-  SlashCommandOptionsOnlyBuilder,
-} from 'discord.js';
 import { executeUnban } from '../../util/helpers.js';
+import { OptionsCommand } from '../../types/CommandTypes.js';
 
-interface Command {
+const command: OptionsCommand = {
-  data: SlashCommandOptionsOnlyBuilder;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
-
-const command: Command = {
   data: new SlashCommandBuilder()
     .setName('unban')
     .setDescription('Unban a user from the server')

src/commands/moderation/warn.ts

@@ -1,18 +1,10 @@
-import {
+import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
-  CommandInteraction,
+
-  PermissionsBitField,
-  SlashCommandBuilder,
-  SlashCommandOptionsOnlyBuilder,
-} from 'discord.js';
 import { updateMemberModerationHistory } from '../../db/db.js';
+import { OptionsCommand } from '../../types/CommandTypes.js';
 import logAction from '../../util/logging/logAction.js';
 
-interface Command {
+const command: OptionsCommand = {
-  data: SlashCommandOptionsOnlyBuilder;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
-
-const command: Command = {
   data: new SlashCommandBuilder()
     .setName('warn')
     .setDescription('Warn a member')

src/commands/testing/testJoin.ts

@@ -1,14 +1,6 @@
-import {
+import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
-  CommandInteraction,
-  PermissionsBitField,
-  SlashCommandBuilder,
-  SlashCommandOptionsOnlyBuilder,
-} from 'discord.js';
 
-interface Command {
+import { Command } from '../../types/CommandTypes.js';
-  data: SlashCommandOptionsOnlyBuilder;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/testing/testLeave.ts

@@ -1,15 +1,7 @@
-import {
+import { PermissionsBitField, SlashCommandBuilder } from 'discord.js';
-  CommandInteraction,
-  PermissionsBitField,
-  SlashCommandBuilder,
-  SlashCommandOptionsOnlyBuilder,
-} from 'discord.js';
-import { updateMember } from '../../db/db.js';
 
-interface Command {
+import { updateMember } from '../../db/db.js';
-  data: SlashCommandOptionsOnlyBuilder;
+import { Command } from '../../types/CommandTypes.js';
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/members.ts

@@ -1,6 +1,5 @@
 import {
   SlashCommandBuilder,
-  CommandInteraction,
   EmbedBuilder,
   ButtonBuilder,
   ActionRowBuilder,
@@ -9,12 +8,9 @@ import {
   APIEmbed,
   JSONEncodable,
 } from 'discord.js';
-import { getAllMembers } from '../../db/db.js';
 
-interface Command {
+import { getAllMembers } from '../../db/db.js';
-  data: Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
+import { Command } from '../../types/CommandTypes.js';
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/ping.ts

@@ -1,9 +1,6 @@
-import { SlashCommandBuilder, CommandInteraction } from 'discord.js';
+import { SlashCommandBuilder } from 'discord.js';
 
-interface Command {
+import { Command } from '../../types/CommandTypes.js';
-  data: Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/rules.ts

@@ -1,13 +1,6 @@
-import {
+import { SlashCommandBuilder, EmbedBuilder } from 'discord.js';
-  SlashCommandBuilder,
-  CommandInteraction,
-  EmbedBuilder,
-} from 'discord.js';
 
-interface Command {
+import { Command } from '../../types/CommandTypes.js';
-  data: Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
 
 const rulesEmbed = new EmbedBuilder()
   .setColor(0x0099ff)

src/commands/util/server.ts

@@ -1,9 +1,6 @@
-import { SlashCommandBuilder, CommandInteraction } from 'discord.js';
+import { SlashCommandBuilder } from 'discord.js';
 
-interface Command {
+import { Command } from '../../types/CommandTypes.js';
-  data: Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
 
 const command: Command = {
   data: new SlashCommandBuilder()

src/commands/util/user-info.ts

@@ -1,19 +1,14 @@
 import {
   SlashCommandBuilder,
-  CommandInteraction,
   EmbedBuilder,
-  SlashCommandOptionsOnlyBuilder,
   GuildMember,
   PermissionsBitField,
 } from 'discord.js';
+
 import { getMember } from '../../db/db.js';
+import { OptionsCommand } from '../../types/CommandTypes.js';
 
-interface Command {
+const command: OptionsCommand = {
-  data: SlashCommandOptionsOnlyBuilder;
-  execute: (interaction: CommandInteraction) => Promise<void>;
-}
-
-const command: Command = {
   data: new SlashCommandBuilder()
     .setName('userinfo')
     .setDescription('Provides information about the specified user.')

src/types/CommandTypes.ts

@@ -1,6 +1,15 @@
-import { CommandInteraction, SlashCommandBuilder } from 'discord.js';
+import {
+  CommandInteraction,
+  SlashCommandBuilder,
+  SlashCommandOptionsOnlyBuilder,
+} from 'discord.js';
 
 export interface Command {
   data: Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
   execute: (interaction: CommandInteraction) => Promise<void>;
 }
+
+export interface OptionsCommand {
+  data: SlashCommandOptionsOnlyBuilder;
+  execute: (interaction: CommandInteraction) => Promise<void>;
+}