zumito-framework 1.1.47 → 1.1.49

package/dist/baseModule/events/discord/interactionCreate.js

@@ -30,11 +30,19 @@ export class InteractionCreate extends FrameworkEvent {
             });
             if (![CommandType.any, CommandType.separated, CommandType.slash].includes(commandInstance.type))
                 return;
+            const trans = (key, params) => {
+                if (key.startsWith('$')) {
+                    return framework.translations.get(key.replace('$', ''), guildSettings.lang, params);
+                }
+                else {
+                    return framework.translations.get('command.' + commandInstance.name + '.' + key, guildSettings.lang, params);
+                }
+            };
             if (commandInstance.type === CommandType.separated || commandInstance.type === CommandType.slash) {
-                await commandInstance.executeSlashCommand({ client, interaction, args, framework, guildSettings });
+                await commandInstance.executeSlashCommand({ client, interaction, args, framework, guildSettings, trans });
             }
             else {
-                await commandInstance.execute({ client, interaction, args, framework, guildSettings });
+                await commandInstance.execute({ client, interaction, args, framework, guildSettings, trans });
             }
         }
         else if (interaction.isButton()) {
@@ -42,6 +50,8 @@ export class InteractionCreate extends FrameworkEvent {
         else if (interaction.isSelectMenu()) {
             let path = interaction.customId.split('.');
             const command = framework.commands.get(path[0]);
+            if (!command)
+                throw new Error(`Command ${path[0]} not found or select menu id bad formatted`);
             if (command.selectMenu) {
                 command.selectMenu({ path, interaction, client, framework, guildSettings });
             }

package/dist/baseModule/events/discord/messageCreate.js

@@ -1,9 +1,9 @@
+import * as url from 'url';
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, PermissionsBitField } from "discord.js";
+import ErrorStackParser from 'error-stack-parser';
 import { FrameworkEvent } from "../../../types/FrameworkEvent.js";
 import { ZumitoFramework } from "../../../ZumitoFramework.js";
 import leven from 'leven';
-import ErrorStackParser from 'error-stack-parser';
-import * as url from 'url';
 import path from "path";
 export class MessageCreate extends FrameworkEvent {
     once = false;
@@ -99,6 +99,14 @@ export class MessageCreate extends FrameworkEvent {
                     client: framework.client,
                     framework: framework,
                     guildSettings: guildSettings,
+                    trans: (key, params) => {
+                        if (key.startsWith('$')) {
+                            return framework.translations.get(key.replace('$', ''), guildSettings.lang, params);
+                        }
+                        else {
+                            return framework.translations.get('command.' + commandInstance.name + '.' + key, guildSettings.lang, params);
+                        }
+                    }
                 });
                 if (!message.channel.isDMBased && !message.deletable && (false)) { // false = settings.deleteCommands
                     try {

package/dist/types/Command.d.ts

@@ -18,7 +18,7 @@ export declare abstract class Command {
     type: string;
     constructor();
     abstract execute({ message, interaction, args, client, framework }: CommandParameters): void;
-    executePrefixCommand({ message, interaction, args, client, framework }: CommandParameters): void;
-    executeSlashCommand({ message, interaction, args, client, framework }: CommandParameters): void;
+    executePrefixCommand({ message, interaction, args, client, framework, trans }: CommandParameters): void;
+    executeSlashCommand({ message, interaction, args, client, framework, trans }: CommandParameters): void;
     abstract selectMenu({ path, interaction, client, framework }: SelectMenuParameters): void;
 }

package/dist/types/Command.js

@@ -16,10 +16,10 @@ export class Command {
     type = CommandType.prefix;
     constructor() {
     }
-    executePrefixCommand({ message, interaction, args, client, framework }) {
-        this.execute({ message, interaction, args, client, framework });
+    executePrefixCommand({ message, interaction, args, client, framework, trans }) {
+        this.execute({ message, interaction, args, client, framework, trans });
     }
-    executeSlashCommand({ message, interaction, args, client, framework }) {
-        this.execute({ message, interaction, args, client, framework });
+    executeSlashCommand({ message, interaction, args, client, framework, trans }) {
+        this.execute({ message, interaction, args, client, framework, trans });
     }
 }

package/dist/types/CommandParameters.d.ts

@@ -15,4 +15,5 @@ export interface CommandParameters {
     client: Client;
     framework: ZumitoFramework;
     guildSettings?: any;
+    trans: Function;
 }

package/dist/types/Module.js

@@ -145,10 +145,10 @@ export class Module {
             if (file.endsWith('.json')) {
                 let json = await this.loadTranslationFile(subpath, file);
                 let lang = file.slice(0, -5);
-                subpath = subpath ? subpath.replaceAll('/', '.') + '.' : '';
-                this.parseTranslation(subpath, lang, json);
+                let baseKey = subpath ? subpath.replaceAll('/', '.').replaceAll('\\', '.') + '.' : '';
+                this.parseTranslation(baseKey, lang, json);
             }
-            else if (fs.lstatSync(path.join(this.path, 'translations', file)).isDirectory()) {
+            else if (fs.lstatSync(path.join(this.path, 'translations', subpath, file)).isDirectory()) {
                 await this.registerTranslations(path.join(subpath, file));
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.1.47",
+  "version": "1.1.49",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",