zumito-framework 1.1.70 → 1.1.72-dev-update-pull-request-ci.0

package/dist/ZumitoFramework.d.ts

@@ -1,12 +1,13 @@
 import { Client, GuildMember, TextChannel } from 'discord.js';
-import { Command } from './types/Command.js';
-import { DatabaseModel } from './types/DatabaseModel.js';
+import { DatabaseModel } from './definitions/DatabaseModel.js';
 import { EventEmitter } from 'events';
-import { FrameworkEvent } from './types/FrameworkEvent.js';
-import { FrameworkSettings } from './types/FrameworkSettings.js';
-import { Module } from './types/Module.js';
-import { StatusManager } from './managers/StatusManager.js';
-import { TranslationManager } from './TranslationManager.js';
+import { FrameworkEvent } from './definitions/FrameworkEvent.js';
+import { FrameworkSettings } from './definitions/FrameworkSettings.js';
+import { StatusManager } from './services/StatusManager.js';
+import { TranslationManager } from './services/TranslationManager.js';
+import { EventManager } from './services/EventManager.js';
+import { CommandManager } from './services/CommandManager.js';
+import { ModuleManager } from './services/ModuleManager.js';
 /**
  * @class ZumitoFramework
  * @description The main class of the framework.
@@ -37,18 +38,18 @@ export declare class ZumitoFramework {
      */
     settings: FrameworkSettings;
     /**
-     * The modules loaded in the framework.
-     * @type {Map<string, Module>}
+     * Module manager instance
+     * @type {ModuleManager}
      * @private
      */
-    modules: Map<string, Module>;
+    modules: ModuleManager;
     /**
      * The commands loaded in the framework.
-     * @type {Map<string, Command>}
+     * @type {CommandManager}
      * @private
      * @see {@link Command}
      */
-    commands: Map<string, Command>;
+    commands: CommandManager;
     /**
      * The events loaded in the framework.
      * @type {Map<string, FrameworkEvent>}
@@ -99,6 +100,13 @@ export declare class ZumitoFramework {
      * @see {@link https://nodejs.org/api/events.html#events_class_eventemitter}
      */
     eventEmitter: EventEmitter;
+    /**
+     * Event manager for the framework.
+     * All events related to the framework and discord.js are handled here.
+     * @type {EventManager}
+     * @private
+     */
+    eventManager: EventManager;
     /**
      * @constructor
      * @param {FrameworkSettings} settings - The settings to use for the framework.

package/dist/ZumitoFramework.js

@@ -1,15 +1,13 @@
 import * as fs from 'fs';
 import * as url from 'url';
 import { Client, SlashCommandBuilder, } from 'discord.js';
-import { ApiResponse } from './definitions/ApiResponse.js';
-import { CommandType } from './types/CommandType.js';
+import { ApiResponse } from './definitions/api/ApiResponse.js';
+import { CommandType } from './definitions/commands/CommandType.js';
 import { EventEmitter } from 'events';
-import { Module } from './types/Module.js';
 import { REST } from '@discordjs/rest';
 import { Routes } from 'discord-api-types/v9';
-import { StatusManager } from './managers/StatusManager.js';
-import { TranslationManager } from './TranslationManager.js';
-import { baseModule } from './baseModule/index.js';
+import { StatusManager } from './services/StatusManager.js';
+import { TranslationManager } from './services/TranslationManager.js';
 import { betterLogging } from 'better-logging';
 import canario from 'canario';
 import cookieParser from 'cookie-parser';
@@ -17,6 +15,9 @@ import cors from 'cors';
 import express from 'express';
 import http from 'http';
 import path from 'path';
+import { EventManager } from './services/EventManager.js';
+import { CommandManager } from './services/CommandManager.js';
+import { ModuleManager } from './services/ModuleManager.js';
 // import better-logging
 betterLogging(console);
 /**
@@ -49,14 +50,14 @@ export class ZumitoFramework {
      */
     settings;
     /**
-     * The modules loaded in the framework.
-     * @type {Map<string, Module>}
+     * Module manager instance
+     * @type {ModuleManager}
      * @private
      */
     modules;
     /**
      * The commands loaded in the framework.
-     * @type {Map<string, Command>}
+     * @type {CommandManager}
      * @private
      * @see {@link Command}
      */
@@ -111,6 +112,13 @@ export class ZumitoFramework {
      * @see {@link https://nodejs.org/api/events.html#events_class_eventemitter}
      */
     eventEmitter = new EventEmitter();
+    /**
+     * Event manager for the framework.
+     * All events related to the framework and discord.js are handled here.
+     * @type {EventManager}
+     * @private
+     */
+    eventManager;
     /**
      * @constructor
      * @param {FrameworkSettings} settings - The settings to use for the framework.
@@ -118,11 +126,12 @@ export class ZumitoFramework {
      */
     constructor(settings, callback) {
         this.settings = settings;
-        this.modules = new Map();
-        this.commands = new Map();
+        this.modules = new ModuleManager(this);
+        this.commands = new CommandManager(this);
         this.events = new Map();
         this.translations = new TranslationManager();
         this.models = [];
+        this.eventManager = new EventManager();
         if (settings.logLevel) {
             console.logLevel = settings.logLevel;
         }
@@ -145,8 +154,10 @@ export class ZumitoFramework {
      */
     async initialize() {
         await this.initializeDatabase();
-        this.initializeDiscordClient();
+        await this.initializeDiscordClient();
         this.startApiServer();
+        this.eventManager.addEventEmitter('discord', this.client);
+        this.eventManager.addEventEmitter('framework', this.eventEmitter);
         await this.registerModules();
         await this.refreshSlashCommands();
         if (this.settings.statusOptions) {
@@ -226,7 +237,7 @@ export class ZumitoFramework {
         else
             return;
         const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
-        await this.registerModule(__dirname, 'baseModule', baseModule);
+        await this.registerModule(path.join(__dirname, 'modules', 'core'), 'baseModule');
         const files = fs.readdirSync(modulesFolder);
         for (const file of files) {
             await this.registerModule(modulesFolder, file);
@@ -250,65 +261,29 @@ export class ZumitoFramework {
     }
     async registerModule(modulesFolder, moduleName, module) {
         if (!module) {
-            if (fs.existsSync(path.join(modulesFolder, moduleName, 'index.js'))) {
-                module = await import('file://' + path.join(modulesFolder, moduleName, 'index.js'));
-                module = Object.values(module)[0];
-            }
-            else if (fs.existsSync(path.join(modulesFolder, moduleName, 'index.ts'))) {
-                module = await import('file://' + path.join(modulesFolder, moduleName, 'index.ts'));
-                module = Object.values(module)[0];
-            }
-            else {
-                module = Module;
-            }
+            module = await this.modules.loadModuleFile(path.join(modulesFolder, moduleName));
         }
         // Create module instance
-        let moduleInstance;
-        try {
-            moduleInstance = new module(path.join(modulesFolder, moduleName), this);
-            await moduleInstance.initialize();
-            this.modules.set(moduleName || moduleInstance.constructor.name, moduleInstance);
-        }
-        catch (err) {
-            console.error(`[📦🔴] Error loading module ${moduleName}: ${err.message}`);
-            console.error(err.stack);
-        }
-        // Register module commands
-        if (moduleInstance.getCommands()) {
-            moduleInstance.getCommands().forEach((command) => {
-                this.commands.set(command.name, command);
-            });
-        }
-        this.commands = new Map([
-            ...this.commands,
-            ...moduleInstance.getCommands(),
-        ]);
-        // Register module events
-        this.events = new Map([...this.events, ...moduleInstance.getEvents()]);
-        // Register models
-        moduleInstance.getModels().forEach((model) => {
-            this.models.push(model);
-        });
-        /*
-
-        // Register module routes
-        this.routes = new Map([...this.routes, ...moduleInstance.getRoutes()]);
-
-        */
+        const moduleInstance = await this.modules.instanceModule(module, path.join(modulesFolder, moduleName), moduleName);
+        // Register module in the framework
+        this.modules.registerModule(moduleInstance);
     }
     /**
      * Initializes the Discord client using the Discord.js library.
      * Logs in to the Discord API using the provided token and logs a message when the client is ready.
      * @private
      */
-    initializeDiscordClient() {
+    async initializeDiscordClient() {
         this.client = new Client({
             intents: this.settings.discordClientOptions.intents,
         });
         this.client.login(this.settings.discordClientOptions.token);
-        this.client.on('ready', () => {
-            // Bot emoji
-            console.log('[🤖🟢] Discord client ready');
+        await new Promise((resolve) => {
+            this.client.on('ready', () => {
+                // Bot emoji
+                console.log('[🤖🟢] Discord client ready');
+                resolve();
+            });
         });
     }
     /**
@@ -414,7 +389,7 @@ export class ZumitoFramework {
     }
     async refreshSlashCommands() {
         const rest = new REST({ version: '10' }).setToken(this.settings.discordClientOptions.token);
-        const commands = Array.from(this.commands.values())
+        const commands = Array.from(this.commands.getAll().values())
             .filter((command) => command.type == CommandType.slash ||
             command.type == CommandType.separated ||
             command.type == CommandType.any)

package/dist/{types → definitions}/Module.d.ts

@@ -1,27 +1,25 @@
 import { ZumitoFramework } from '../ZumitoFramework.js';
-import { Command } from './Command.js';
+import { Command } from './commands/Command.js';
 import { FrameworkEvent } from './FrameworkEvent.js';
 import { DatabaseModel } from './DatabaseModel.js';
+import { CommandManager } from '../services/CommandManager.js';
 export declare abstract class Module {
     protected path: string;
     protected framework: ZumitoFramework;
-    protected commands: Map<string, Command>;
+    protected commands: CommandManager;
     protected events: Map<string, FrameworkEvent>;
     protected models: Array<DatabaseModel>;
+    protected commandManager: CommandManager;
     constructor(path: any, framework: any);
     initialize(): Promise<void>;
     registerCommands(): Promise<void>;
-    onCommandCreated(filePath: string): Promise<void>;
-    onCommandChanged(filePath: string): Promise<void>;
-    onErrorLoadingCommand(error: Error): void;
     getCommands(): Map<string, Command>;
     registerEvents(): Promise<void>;
-    registerDiscordEvent(frameworkEvent: FrameworkEvent): void;
+    registerEventsFolder(folder: string): Promise<void>;
+    registerEvent(frameworkEvent: FrameworkEvent, emitterName: string): void;
     parseEventArgs(args: any[]): any;
     getEvents(): Map<string, FrameworkEvent>;
     registerTranslations(subpath?: string): Promise<void>;
-    loadTranslationFile(subpath: string, file: string): Promise<any>;
-    parseTranslation(path: string, lang: string, json: any): any;
     registerModels(): Promise<void>;
     getModels(): Array<DatabaseModel>;
 }

package/dist/definitions/Module.js

@@ -0,0 +1,129 @@
+import * as fs from 'fs';
+import path from 'path';
+import { ButtonInteraction, CommandInteraction, ModalSubmitInteraction, StringSelectMenuInteraction, } from 'discord.js';
+import { CommandManager } from '../services/CommandManager.js';
+export class Module {
+    path;
+    framework;
+    commands;
+    events = new Map();
+    models = [];
+    commandManager;
+    constructor(path, framework) {
+        this.path = path;
+        this.framework = framework;
+        this.commands = new CommandManager(framework);
+    }
+    async initialize() {
+        await this.registerCommands();
+        await this.registerEvents();
+        await this.registerTranslations();
+        await this.registerModels();
+    }
+    async registerCommands() {
+        const commandsFolder = path.join(this.path, 'commands');
+        if (fs.existsSync(commandsFolder)) {
+            await this.commands.loadCommandsFolder(commandsFolder);
+            // register watcher
+            if (process.env.DEBUG) {
+                /*
+                    Debug only cause in prod environment commands should't be changed.
+                    Appart from that, esm module cache invalidation is not working properly
+                    and can cause memory leaks and crashes.
+                */
+                this.commands.watchCommandsFolder(commandsFolder);
+            }
+        }
+    }
+    getCommands() {
+        return this.commands.getAll();
+    }
+    async registerEvents() {
+        if (!fs.existsSync(path.join(this.path, 'events')))
+            return;
+        const files = fs.readdirSync(path.join(this.path, 'events'));
+        for (const file of files) {
+            // if file is folder
+            if (fs.lstatSync(path.join(this.path, 'events', file)).isDirectory()) {
+                console.log('registering events folder ' + file);
+                this.registerEventsFolder(file);
+            }
+        }
+    }
+    async registerEventsFolder(folder) {
+        const folderPath = path.join(this.path, 'events', folder);
+        if (!fs.existsSync(folderPath))
+            throw new Error(`Folder ${folder} doesn't exist`);
+        const files = fs.readdirSync(folderPath);
+        for (const file of files) {
+            if (file.endsWith('d.ts'))
+                continue;
+            if (file.endsWith('.js') || file.endsWith('.ts')) {
+                let event = await import('file://' + path.join(folderPath, file)).catch((e) => {
+                    console.error(`[🔄🔴 ] Error loading ${file.slice(0, -3)} event on module ${this.constructor.name}`);
+                });
+                event = Object.values(event)[0];
+                event = new event();
+                this.events.set(event.constructor.name.toLowerCase(), event);
+                this.registerEvent(event, folder);
+            }
+        }
+    }
+    registerEvent(frameworkEvent, emitterName) {
+        if (frameworkEvent.disabled)
+            return;
+        const once = frameworkEvent.once;
+        const eventName = frameworkEvent.constructor.name.charAt(0).toLowerCase() +
+            frameworkEvent.constructor.name.slice(1);
+        this.framework.eventManager.addEventListener(emitterName, eventName, (...args) => {
+            const finalArgs = this.parseEventArgs(args);
+            frameworkEvent.execute(finalArgs);
+        }, { once });
+    }
+    parseEventArgs(args) {
+        const finalArgs = {
+            framework: this.framework,
+            client: this.framework.client,
+        };
+        args.forEach((arg) => {
+            finalArgs[arg.constructor.name.toLowerCase()] = arg;
+        });
+        const interaction = args.find((arg) => arg instanceof StringSelectMenuInteraction ||
+            arg instanceof CommandInteraction ||
+            arg instanceof ButtonInteraction ||
+            arg instanceof ModalSubmitInteraction);
+        if (interaction) {
+            finalArgs['interaction'] = interaction;
+        }
+        return finalArgs;
+    }
+    getEvents() {
+        return this.events;
+    }
+    async registerTranslations(subpath = '') {
+        if (!fs.existsSync(path.join(this.path, 'translations', subpath)))
+            return;
+        this.framework.translations.registerTranslationsFromFolder(path.join(this.path, 'translations', subpath), '', process.env.DEBUG ? true : false);
+    }
+    async registerModels() {
+        if (!fs.existsSync(path.join(this.path, 'models')))
+            return;
+        const files = fs.readdirSync(path.join(this.path, 'models'));
+        for (const file of files) {
+            if (file.endsWith('d.ts'))
+                continue;
+            if (file.endsWith('.ts') || file.endsWith('.js')) {
+                let model = await import('file://' + `${this.path}/models/${file}`).catch((e) => {
+                    console.error(`[🔄🔴 ] Error loading ${file.slice(0, -3)} model on module ${this.constructor.name}`);
+                    console.error(e + '\n' + e.name + '\n' + e.stack);
+                });
+                model = Object.values(model)[0];
+                model = new model();
+                this.models.push(model);
+            }
+        }
+    }
+    getModels() {
+        return this.models;
+    }
+}

package/dist/{types → definitions}/Translation.d.ts

@@ -1,6 +1,5 @@
 export declare class Translation {
     text: Map<string, string>;
-    constructor();
     get(language: string, params?: any): string;
     set(language: string, text: string): void;
     has(language: string): boolean;

package/dist/{types → definitions}/Translation.js

@@ -1,6 +1,5 @@
 export class Translation {
     text = new Map();
-    constructor() { }
     get(language, params) {
         let text;
         if (this.has(language)) {

package/dist/{types → definitions/commands}/Command.d.ts

@@ -1,6 +1,6 @@
 import { CommandArgDefinition } from './CommandArgDefinition.js';
 import { CommandParameters } from './CommandParameters.js';
-import { SelectMenuParameters } from './SelectMenuParameters.js';
+import { SelectMenuParameters } from '../parameters/SelectMenuParameters.js';
 /**
  * @name Command
  * @description Base class for all commands

package/dist/{types → definitions/commands}/CommandParameters.d.ts

@@ -1,5 +1,5 @@
 import { Client, CommandInteraction, Message } from 'discord.js';
-import { ZumitoFramework } from '../ZumitoFramework.js';
+import { ZumitoFramework } from '../../ZumitoFramework.js';
 /**
  * @class CommandParameters
  * @classdesc Parameters passed to a command execution.

package/dist/{types → definitions/parameters}/EventParameters.d.ts

@@ -1,5 +1,5 @@
 import { Client, Interaction, Message } from 'discord.js';
-import { ZumitoFramework } from '../ZumitoFramework.js';
+import { ZumitoFramework } from '../../ZumitoFramework.js';
 export interface EventParameters {
     message?: Message;
     interaction?: Interaction;

package/dist/{types/Commands → definitions/parameters}/SelectMenu.d.ts

@@ -1,4 +1,4 @@
-import { SelectMenuParameters } from '../SelectMenuParameters.js';
+import { SelectMenuParameters } from './SelectMenuParameters.js';
 export declare abstract class SelectMenuSelected {
     abstract selectMenu(selectMenuParameters: SelectMenuParameters): void;
 }

package/dist/{types → definitions/parameters}/SelectMenuParameters.d.ts

@@ -1,5 +1,5 @@
 import { Client, SelectMenuInteraction } from 'discord.js';
-import { ZumitoFramework } from '../ZumitoFramework.js';
+import { ZumitoFramework } from '../../ZumitoFramework.js';
 export interface SelectMenuParameters {
     path: string[];
     interaction: SelectMenuInteraction;

package/dist/index.d.ts

@@ -1,24 +1,24 @@
-import { PresenceDataRule, RuledPresenceData, StatusManagerOptions } from './types/StatusManagerOptions.js';
-import { ApiResponse } from './definitions/ApiResponse.js';
-import { ButtonPressed } from './types/Commands/ButtonPressed.js';
-import { ButtonPressedParams } from './types/Commands/ButtonPressedParams.js';
-import { Command } from './types/Command.js';
-import { CommandArgDefinition } from './types/CommandArgDefinition.js';
-import { CommandArguments } from './types/CommandArguments.js';
-import { CommandChoiceDefinition } from './types/CommandChoiceDefinition.js';
-import { CommandParameters } from './types/CommandParameters.js';
-import { CommandType } from './types/CommandType.js';
-import { DatabaseConfigLoader } from './utils/DatabaseConfigLoader.js';
-import { DatabaseModel } from './types/DatabaseModel.js';
-import { EmojiFallback } from './utils/EmojiFallback.js';
-import { FrameworkEvent } from './types/FrameworkEvent.js';
-import { FrameworkSettings } from './types/FrameworkSettings.js';
-import { Module } from './types/Module.js';
-import { SelectMenuParameters } from './types/SelectMenuParameters.js';
-import { TextFormatter } from './utils/TextFormatter.js';
-import { Translation } from './types/Translation.js';
-import { TranslationManager } from './TranslationManager.js';
+import { PresenceDataRule, RuledPresenceData, StatusManagerOptions } from './definitions/StatusManagerOptions.js';
+import { ApiResponse } from './definitions/api/ApiResponse.js';
+import { ButtonPressed } from './definitions/parameters/ButtonPressed.js';
+import { ButtonPressedParams } from './definitions/parameters/ButtonPressedParams.js';
+import { Command } from './definitions/commands/Command.js';
+import { CommandArgDefinition } from './definitions/commands/CommandArgDefinition.js';
+import { CommandArguments } from './definitions/commands/CommandArguments.js';
+import { CommandChoiceDefinition } from './definitions/commands/CommandChoiceDefinition.js';
+import { CommandParameters } from './definitions/commands/CommandParameters.js';
+import { CommandType } from './definitions/commands/CommandType.js';
+import { DatabaseConfigLoader } from './services/DatabaseConfigLoader.js';
+import { DatabaseModel } from './definitions/DatabaseModel.js';
+import { EmojiFallback } from './services/EmojiFallback.js';
+import { FrameworkEvent } from './definitions/FrameworkEvent.js';
+import { FrameworkSettings } from './definitions/FrameworkSettings.js';
+import { Module } from './definitions/Module.js';
+import { SelectMenuParameters } from './definitions/parameters/SelectMenuParameters.js';
+import { TextFormatter } from './services/TextFormatter.js';
+import { Translation } from './definitions/Translation.js';
+import { TranslationManager } from './services/TranslationManager.js';
 import { ZumitoFramework } from './ZumitoFramework.js';
 import * as discord from 'discord.js';
-import { EventParameters } from './types/EventParameters.js';
+import { EventParameters } from './definitions/parameters/EventParameters.js';
 export { ZumitoFramework, FrameworkSettings, Command, Module, CommandParameters, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, SelectMenuParameters, CommandType, CommandArgDefinition, CommandChoiceDefinition, ButtonPressed, ButtonPressedParams, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, PresenceDataRule, RuledPresenceData, StatusManagerOptions, discord, EventParameters, };

package/dist/index.js

@@ -1,16 +1,16 @@
-import { ApiResponse } from './definitions/ApiResponse.js';
-import { ButtonPressed } from './types/Commands/ButtonPressed.js';
-import { Command } from './types/Command.js';
-import { CommandArguments } from './types/CommandArguments.js';
-import { CommandType } from './types/CommandType.js';
-import { DatabaseConfigLoader } from './utils/DatabaseConfigLoader.js';
-import { DatabaseModel } from './types/DatabaseModel.js';
-import { EmojiFallback } from './utils/EmojiFallback.js';
-import { FrameworkEvent } from './types/FrameworkEvent.js';
-import { Module } from './types/Module.js';
-import { TextFormatter } from './utils/TextFormatter.js';
-import { Translation } from './types/Translation.js';
-import { TranslationManager } from './TranslationManager.js';
+import { ApiResponse } from './definitions/api/ApiResponse.js';
+import { ButtonPressed } from './definitions/parameters/ButtonPressed.js';
+import { Command } from './definitions/commands/Command.js';
+import { CommandArguments } from './definitions/commands/CommandArguments.js';
+import { CommandType } from './definitions/commands/CommandType.js';
+import { DatabaseConfigLoader } from './services/DatabaseConfigLoader.js';
+import { DatabaseModel } from './definitions/DatabaseModel.js';
+import { EmojiFallback } from './services/EmojiFallback.js';
+import { FrameworkEvent } from './definitions/FrameworkEvent.js';
+import { Module } from './definitions/Module.js';
+import { TextFormatter } from './services/TextFormatter.js';
+import { Translation } from './definitions/Translation.js';
+import { TranslationManager } from './services/TranslationManager.js';
 import { ZumitoFramework } from './ZumitoFramework.js';
 import * as discord from 'discord.js';
 export { ZumitoFramework, Command, Module, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, CommandType, ButtonPressed, TextFormatter, EmojiFallback, DatabaseConfigLoader, DatabaseModel, discord, };

package/dist/{baseModule/events/discord/interactionCreate.d.ts → modules/core/baseModule/events/discord/InteractionCreate.d.ts}

@@ -1,6 +1,6 @@
-import { Command } from '../../../types/Command.js';
-import { EventParameters } from '../../../types/EventParameters.js';
-import { FrameworkEvent } from '../../../types/FrameworkEvent.js';
+import { Command } from '../../../../../definitions/commands/Command.js';
+import { EventParameters } from '../../../../../definitions/parameters/EventParameters.js';
+import { FrameworkEvent } from '../../../../../definitions/FrameworkEvent.js';
 export declare class InteractionCreate extends FrameworkEvent {
     once: boolean;
     execute({ interaction, client, framework, }: EventParameters): Promise<void>;

package/dist/{baseModule/events/discord/interactionCreate.js → modules/core/baseModule/events/discord/InteractionCreate.js}

@@ -1,5 +1,5 @@
-import { CommandType } from '../../../types/CommandType.js';
-import { FrameworkEvent } from '../../../types/FrameworkEvent.js';
+import { CommandType } from '../../../../../definitions/commands/CommandType.js';
+import { FrameworkEvent } from '../../../../../definitions/FrameworkEvent.js';
 export class InteractionCreate extends FrameworkEvent {
     once = false;
     async execute({ interaction, client, framework, }) {
@@ -8,7 +8,7 @@ export class InteractionCreate extends FrameworkEvent {
             guildSettings = await framework.getGuildSettings(interaction.guildId);
         }
         if (interaction.isCommand()) {
-            if (!framework.commands.has(interaction.commandName))
+            if (!framework.commands.getAll().has(interaction.commandName))
                 return;
             const commandInstance = framework.commands.get(interaction.commandName);
             const args = new Map();
@@ -37,32 +37,18 @@ export class InteractionCreate extends FrameworkEvent {
                     }
                 }
             });
-            if (![
-                CommandType.any,
-                CommandType.separated,
-                CommandType.slash,
-            ].includes(commandInstance.type))
+            if (![CommandType.any, CommandType.separated, CommandType.slash,].includes(commandInstance.type))
                 return;
             const trans = this.getTransMethod(commandInstance, framework, guildSettings);
             if (commandInstance.type === CommandType.separated ||
                 commandInstance.type === CommandType.slash) {
                 await commandInstance.executeSlashCommand({
-                    client,
-                    interaction,
-                    args,
-                    framework,
-                    guildSettings,
-                    trans,
+                    client, interaction, args, framework, guildSettings, trans,
                 });
             }
             else {
                 await commandInstance.execute({
-                    client,
-                    interaction,
-                    args,
-                    framework,
-                    guildSettings,
-                    trans,
+                    client, interaction, args, framework, guildSettings, trans,
                 });
             }
         }
@@ -83,7 +69,7 @@ export class InteractionCreate extends FrameworkEvent {
                 });
             }
         }
-        else if (interaction.isSelectMenu()) {
+        else if (interaction.isStringSelectMenu()) {
             const path = interaction.customId.split('.');
             const commandInstance = framework.commands.get(path[0]);
             if (!commandInstance)
@@ -107,6 +93,27 @@ export class InteractionCreate extends FrameworkEvent {
                 });
             }
         }
+        else if (interaction.isModalSubmit()) {
+            const path = interaction.customId.split('.');
+            const commandInstance = framework.commands.get(path[0]);
+            if (!commandInstance) {
+                throw new Error(`Command ${path[0]} not found or modal id bad formatted`);
+            }
+            if (commandInstance.modalSubmit) {
+                commandInstance.modalSubmit({
+                    path,
+                    interaction,
+                    client,
+                    framework,
+                    guildSettings,
+                });
+            }
+            else {
+                framework.eventManager.emitEvent('modalSubmit', 'framework', {
+                    path, interaction, client, framework, guildSettings,
+                });
+            }
+        }
     }
     getTransMethod(commandInstance, framework, guildSettings) {
         return (key, params) => {