zumito-framework 1.1.34 → 1.1.35

package/dist/ZumitoFramework.d.ts

@@ -46,4 +46,5 @@ export declare class ZumitoFramework {
     private initializeDiscordClient;
     static splitCommandLine(commandLine: any): any;
     memberHasPermission(member: GuildMember, channel: TextChannel, permission: bigint): Promise<boolean>;
+    getGuildSettings(guildId: string): Promise<any>;
 }

package/dist/ZumitoFramework.js

@@ -222,6 +222,13 @@ export class ZumitoFramework {
         let memberPermission = await channel.permissionsFor(member);
         return memberPermission.has(permission);
     }
+    async getGuildSettings(guildId) {
+        let guild = await this.models.get('Guild').findOne({ guild_id: guildId });
+        if (guild == null) {
+            guild = await this.models.get('Guild').create({ guild_id: guildId });
+        }
+        return guild;
+    }
 }
 function MergeRecursive(obj1, obj2) {
     for (var p in obj2) {

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

@@ -3,6 +3,10 @@ import { FrameworkEvent } from "../../../types/FrameworkEvent.js";
 export class InteractionCreate extends FrameworkEvent {
     once = false;
     async execute({ interaction, client, framework }) {
+        let guildSettings;
+        if (interaction.guildId) {
+            guildSettings = await framework.getGuildSettings(interaction.guildId);
+        }
         if (interaction.isCommand()) {
             if (!framework.commands.has(interaction.commandName))
                 return;
@@ -17,10 +21,10 @@ export class InteractionCreate extends FrameworkEvent {
             if (![CommandType.any, CommandType.separated, CommandType.slash].includes(commandInstance.type))
                 return;
             if (commandInstance.type === CommandType.separated || commandInstance.type === CommandType.slash) {
-                await commandInstance.executeSlashCommand({ client, interaction, args, framework });
+                await commandInstance.executeSlashCommand({ client, interaction, args, framework, guildSettings });
             }
             else {
-                await commandInstance.execute({ client, interaction, args, framework });
+                await commandInstance.execute({ client, interaction, args, framework, guildSettings });
             }
         }
         else if (interaction.isButton()) {
@@ -29,7 +33,7 @@ export class InteractionCreate extends FrameworkEvent {
             let path = interaction.customId.split('.');
             const command = framework.commands.get(path[0]);
             if (command.selectMenu) {
-                command.selectMenu({ path, interaction, client, framework });
+                command.selectMenu({ path, interaction, client, framework, guildSettings });
             }
         }
     }

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

@@ -62,6 +62,7 @@ export class MessageCreate extends FrameworkEvent {
                 }
             }
             try {
+                let guildSettings = await framework.getGuildSettings(message.guildId);
                 let parsedArgs = new Map();
                 args.forEach(function (arg, index) {
                     parsedArgs.set(commandInstance.args?.[index]?.name || index, arg);
@@ -71,6 +72,7 @@ export class MessageCreate extends FrameworkEvent {
                     args: parsedArgs,
                     client: framework.client,
                     framework: framework,
+                    guildSettings: guildSettings,
                 });
                 if (!message.channel.isDMBased && !message.deletable && (false)) { // false = settings.deleteCommands
                     try {

package/dist/baseModule/models/errors.json

@@ -0,0 +1,14 @@
+{
+    "id": "string",
+    "command": {
+        "command": "string",
+        "args": {
+            "type": "array"
+        }
+    },
+    "error": {
+        "title": "string",
+        "message": "string",
+        "stacktrace": "string"
+    }
+}

package/dist/baseModule/models/guild.json

@@ -0,0 +1,23 @@
+{
+    "guild_id": {
+        "type": "string",
+        "index": true,
+        "unique": true
+    },
+    "lang": {
+        "type": "string",
+        "default": "en"
+    },
+    "prefix": {
+        "type": "string",
+        "default": "z-"
+    },
+    "public": {
+        "type": "boolean",
+        "default": false
+    },
+    "deleteCommands": {
+        "type": "boolean",
+        "default": false
+    }
+}

package/dist/types/Command.d.ts

@@ -3,15 +3,15 @@ import { SelectMenuParameters } from "./SelectMenuParameters.js";
 export declare abstract class Command {
     name: string;
     categories: string[];
-    aliases?: string[];
-    examples?: string[];
-    userPermissions?: bigint[];
-    botPermissions?: string[];
-    hidden?: boolean;
-    adminOnly?: boolean;
-    nsfw?: boolean;
-    cooldown?: number;
-    slashCommand?: boolean;
+    aliases: string[];
+    examples: string[];
+    userPermissions: bigint[];
+    botPermissions: string[];
+    hidden: boolean;
+    adminOnly: boolean;
+    nsfw: boolean;
+    cooldown: number;
+    slashCommand: boolean;
     dm: boolean;
     args: CommandArgDefinition[];
     type: string;

package/dist/types/CommandParameters.d.ts

@@ -14,4 +14,5 @@ export interface CommandParameters {
     args: Map<String, any>;
     client: Client;
     framework: ZumitoFramework;
+    guildSettings?: any;
 }

package/dist/types/Module.js

@@ -18,6 +18,7 @@ export class Module {
         await this.registerCommands();
         await this.registerEvents();
         await this.registerTranslations();
+        await this.registerModels();
         // console.error('[🔄🔴 ] Error initializing module ' + this.constructor.name);
         // console.log(boxen(e + '\n' + e.stack, { padding: 1 }));
     }

package/dist/types/SelectMenuParameters.d.ts

@@ -5,4 +5,5 @@ export interface SelectMenuParameters {
     interaction: SelectMenuInteraction;
     client: Client;
     framework: ZumitoFramework;
+    guildSettings?: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.1.34",
+  "version": "1.1.35",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,8 +35,7 @@
     "express": "^4.18.1",
     "leven": "^4.0.0",
     "mongoose": "^6.5.2",
-    "plop": "^3.1.1",
-    "zumito-framework": "^1.1.16"
+    "plop": "^3.1.1"
   },
   "devDependencies": {
     "@types/node": "^18.7.16",

package/plop-templates/command.js.hbs

@@ -2,7 +2,7 @@ import { Command, CommandParameters } from "zumito-framework";
 
 export class {{capitalize command}} extends Command {
 
-    execute({ message, interaction, args, client, framework }: CommandParameters): void {
+    execute({ message, interaction, args, client, framework, guildSettings }: CommandParameters): void {
         (message || interaction!).reply({
             content: "Message content",
         });