zumito-framework 1.1.36 → 1.1.38

package/dist/ZumitoFramework.js

@@ -78,8 +78,8 @@ export class ZumitoFramework {
             process.exit(1);
         }
         finally {
-            console.log('[🗄️🟢] Database connection successful');
             this.database = mongoose.connection;
+            console.log('[🗄️🟢] Database connection successful');
         }
         this.initializeDiscordClient();
         this.startApiServer();
@@ -134,6 +134,7 @@ export class ZumitoFramework {
             await this.registerModule(modulesFolder, file);
         }
         this.models.forEach((modelDefiniton, modelName) => {
+            console.log('modelDefiniton', modelDefiniton);
             const schema = new mongoose.Schema(modelDefiniton);
             this.models.set(modelName, mongoose.model(modelName, schema));
         });
@@ -228,9 +229,13 @@ export class ZumitoFramework {
         return memberPermission.has(permission);
     }
     async getGuildSettings(guildId) {
-        let guild = await this.models.get('Guild').findOne({ guild_id: guildId });
+        const Guild = this.models.get('Guild');
+        let guild = await Guild.findOne({ guild_id: guildId }).exec();
         if (guild == null) {
-            guild = await this.models.get('Guild').create({ guild_id: guildId });
+            guild = new Guild({
+                guild_id: guildId,
+            });
+            await guild.save();
         }
         return guild;
     }
@@ -250,6 +255,7 @@ export class ZumitoFramework {
                             method = 'addStringOption';
                             break;
                         case 'user':
+                        case 'member':
                             method = 'addUserOption';
                             break;
                         case 'channel':
@@ -258,6 +264,8 @@ export class ZumitoFramework {
                         case 'role':
                             method = 'addRoleOption';
                             break;
+                        default:
+                            throw new Error('Invalid argument type ' + arg.type);
                     }
                     slashCommand[method]((option) => {
                         option.setName(arg.name);

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

@@ -15,7 +15,17 @@ export class InteractionCreate extends FrameworkEvent {
             commandInstance.args.forEach(arg => {
                 let option = interaction.options.get(arg.name);
                 if (option) {
-                    args.set(arg.name, option.value || option.user || option.role || option.channel || option.options || option.message || option.member || option.focused || option.autocomplete || option.attachment);
+                    switch (arg.type) {
+                        case "user":
+                            args.set(arg.name, option.user);
+                            break;
+                        case "member":
+                            args.set(arg.name, option.member);
+                            break;
+                        default:
+                            args.set(arg.name, option.value || option.user || option.role || option.channel || option.options || option.message || option.member || option.focused || option.autocomplete || option.attachment);
+                            break;
+                    }
                 }
             });
             if (![CommandType.any, CommandType.separated, CommandType.slash].includes(commandInstance.type))

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

@@ -69,10 +69,15 @@ export class MessageCreate extends FrameworkEvent {
                     let arg = args[i];
                     let type = commandInstance.args[i]?.type;
                     if (type) {
-                        if (type == 'user') {
+                        if (type == 'member' || type == 'user') {
                             const member = await message.guild.members.cache.get(arg.replace(/[<@!>]/g, ''));
                             if (member) {
-                                parsedArgs.set(commandInstance.args[i].name, member);
+                                if (type == 'user') {
+                                    parsedArgs.set(commandInstance.args[i].name, member.user);
+                                }
+                                else {
+                                    parsedArgs.set(commandInstance.args[i].name, member);
+                                }
                             }
                             else {
                                 return message.reply({

package/dist/types/Module.js

@@ -179,9 +179,9 @@ export class Module {
                     },
                 }).catch(e => {
                     console.error(`[🔄🔴 ] Error loading model ${modelName} on module ${this.constructor.name}`);
-                    console.log(boxen(e + '\n' + e.name + '\n' + e.stack, { padding: 1 }));
+                    console.error(e, e.name, e.stack);
                 });
-                this.models.set(modelName, modelDefiniton);
+                this.models.set(modelName, modelDefiniton.default);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.1.36",
+  "version": "1.1.38",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc",
-    "publish": "npm publish",
+    "publish-npm": "npm publish",
     "docs": "typedoc --out docs src"
   },
   "author": "fernandomema",
@@ -34,7 +34,7 @@
     "error-stack-parser": "^2.1.4",
     "express": "^4.18.1",
     "leven": "^4.0.0",
-    "mongoose": "^6.5.2",
+    "mongoose": "^6.6.5",
     "plop": "^3.1.1"
   },
   "devDependencies": {