zumito-framework 1.2.18 → 1.2.20

package/dist/definitions/commands/CommandBinds.d.ts

@@ -1,4 +1,6 @@
+import { ModalSubmitParameters } from '@definitions/parameters/ModalSubmitParameters.js';
 import { SelectMenuParameters } from '../parameters/SelectMenuParameters.js';
 export declare type CommandBinds = {
     selectMenu?: (params: SelectMenuParameters) => Promise<void>;
+    modalSubmit?: (params: ModalSubmitParameters) => Promise<void>;
 };

package/dist/definitions/decorators/Injectable.decorator.d.ts

@@ -0,0 +1,2 @@
+import 'reflect-metadata';
+export declare function Injectable(): ClassDecorator;

package/dist/definitions/decorators/Injectable.decorator.js

@@ -0,0 +1,10 @@
+// eslint-disable-next-line check-file/filename-naming-convention
+import { ServiceContainer } from "../..";
+import 'reflect-metadata';
+export function Injectable() {
+    return function (target) {
+        const paramTypes = Reflect.getMetadata('design:paramtypes', target);
+        const paramTypeNames = paramTypes.map((paramType) => paramType.name);
+        ServiceContainer.addService(target, paramTypeNames);
+    };
+}

package/dist/definitions/parameters/ModalSubmitParameters.d.ts

@@ -0,0 +1,10 @@
+import { ModalSubmitInteraction } from 'discord.js';
+export interface ModalSubmitParameters {
+    path: string[];
+    interaction: ModalSubmitInteraction;
+    /**
+     * @deprecated
+     */
+    guildSettings?: any;
+    trans: (key: string, params?: any) => string;
+}

package/dist/definitions/parameters/ModalSubmitParameters.js

@@ -0,0 +1 @@
+export {};

package/dist/index.d.ts

@@ -30,4 +30,7 @@ import { Route, RouteMethod } from './definitions/Route.js';
 import { InteractionHandler } from './services/InteractionHandler.js';
 import { CommandManager } from './services/CommandManager.js';
 import { ErrorType } from './definitions/ErrorType.js';
+export { ModalSubmitParameters } from './definitions/parameters/ModalSubmitParameters.js';
+export { CommandBinds } from './definitions/commands/CommandBinds.js';
+export { Injectable } from './definitions/decorators/Injectable.decorator.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, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager };

package/dist/index.js

@@ -23,6 +23,7 @@ import { Route, RouteMethod } from './definitions/Route.js';
 import { InteractionHandler } from './services/InteractionHandler.js';
 import { CommandManager } from './services/CommandManager.js';
 import { ErrorType } from './definitions/ErrorType.js';
+export { Injectable } from './definitions/decorators/Injectable.decorator.js';
 ServiceContainer.addService(TextFormatter, []);
 ServiceContainer.addService(EmojiFallback, [discord.Client.name, TranslationManager.name]);
 ServiceContainer.addService(GuildDataGetter, [ZumitoFramework.name]);

package/dist/services/CommandManager.d.ts

@@ -2,6 +2,7 @@ import { ZumitoFramework } from "../ZumitoFramework";
 import { Command } from "../definitions/commands/Command.js";
 import { CommandLoadOptions } from "../definitions/CommandLoadOptions";
 import { ErrorHandler } from "./ErrorHandler";
+import 'reflect-metadata';
 export declare class CommandManager {
     protected commands: Map<string, Command>;
     protected framework: ZumitoFramework;

package/dist/services/CommandManager.js

@@ -8,6 +8,7 @@ import { CommandType } from "../definitions/commands/CommandType.js";
 import { ErrorHandler } from "./ErrorHandler";
 import { ServiceContainer } from "./ServiceContainer";
 import { ErrorType } from "../definitions/ErrorType";
+import 'reflect-metadata';
 export class CommandManager {
     commands;
     framework;

package/dist/services/InteractionHandler.d.ts

@@ -5,6 +5,7 @@ import { TranslationManager } from "./TranslationManager";
 import { EventManager } from "./EventManager";
 import { InteractionHandlerSettings } from "@definitions/settings/InteractionHandlerSettings";
 import { ErrorHandler } from "./ErrorHandler";
+import 'reflect-metadata';
 export declare class InteractionHandler {
     protected commandManager: CommandManager;
     protected guildDataGetter: GuildDataGetter;

package/dist/services/InteractionHandler.js

@@ -8,6 +8,7 @@ import { TranslationManager } from "./TranslationManager";
 import { EventManager } from "./EventManager";
 import { ErrorHandler } from "./ErrorHandler";
 import { ErrorType } from "../definitions/ErrorType";
+import 'reflect-metadata';
 export class InteractionHandler {
     commandManager;
     guildDataGetter;
@@ -184,7 +185,15 @@ export class InteractionHandler {
             throw new Error(`Command ${path[0]} not found or modal id bad formatted`);
         }
         const framework = ServiceContainer.getService(ZumitoFramework);
-        if (commandInstance.modalSubmit) {
+        if (commandInstance.binds?.modalSubmit) {
+            const trans = this.translationManager.getShortHandMethod('command.' + commandInstance.name, guildSettings?.lang);
+            commandInstance.binds.modalSubmit({
+                interaction,
+                path,
+                trans,
+            });
+        }
+        else if (commandInstance.modalSubmit) {
             if (!guildSettings && interaction.guildId) {
                 guildSettings = await ServiceContainer.getService(GuildDataGetter).getGuildSettings(interaction.guildId);
             }
@@ -196,11 +205,9 @@ export class InteractionHandler {
                 guildSettings,
             });
         }
-        else {
-            this.eventManager.emitEvent('modalSubmit', 'framework', {
-                client: this.client,
-                path, interaction, framework, guildSettings,
-            });
-        }
+        this.eventManager.emitEvent('modalSubmit', 'framework', {
+            client: this.client,
+            path, interaction, framework, guildSettings,
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.2.18",
+  "version": "1.2.20",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,6 +33,7 @@
     "express": "^4.18.1",
     "leven": "^4.0.0",
     "mongoose": "^6.6.5",
+    "reflect-metadata": "^0.2.2",
     "source-fragment": "^1.1.0",
     "tingodb": "^0.6.1",
     "tseep": "^1.2.2",