zumito-framework 1.8.5 → 1.10.0

package/dist/index.d.ts

@@ -30,7 +30,8 @@ import { InteractionHandler } from './services/handlers/InteractionHandler.js';
 import { CommandManager } from './services/managers/CommandManager.js';
 import { ErrorType } from './definitions/ErrorType.js';
 import { InviteUrlGenerator } from './services/utilities/InviteUrlGenerator.js';
+import { PrefixResolver } from './services/utilities/PrefixResolver.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, PresenceDataRule, RuledPresenceData, StatusManagerOptions, discord, EventParameters, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator };
+export { ZumitoFramework, FrameworkSettings, Command, Module, CommandParameters, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, SelectMenuParameters, CommandType, CommandArgDefinition, CommandChoiceDefinition, ButtonPressed, ButtonPressedParams, TextFormatter, EmojiFallback, DatabaseConfigLoader, PresenceDataRule, RuledPresenceData, StatusManagerOptions, discord, EventParameters, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator, PrefixResolver, };

package/dist/index.js

@@ -23,6 +23,7 @@ import { InteractionHandler } from './services/handlers/InteractionHandler.js';
 import { CommandManager } from './services/managers/CommandManager.js';
 import { ErrorType } from './definitions/ErrorType.js';
 import { InviteUrlGenerator } from './services/utilities/InviteUrlGenerator.js';
+import { PrefixResolver } from './services/utilities/PrefixResolver.js';
 export { Injectable } from './definitions/decorators/Injectable.decorator.js';
 ServiceContainer.addService(TextFormatter, []);
 ServiceContainer.addService(EmojiFallback, [discord.Client.name, TranslationManager.name]);
@@ -32,5 +33,6 @@ ServiceContainer.addService(CommandParser, []);
 ServiceContainer.addService(SlashCommandRefresher, [ZumitoFramework.name]);
 ServiceContainer.addService(InteractionHandler, []);
 ServiceContainer.addService(InviteUrlGenerator, []);
+ServiceContainer.addService(PrefixResolver, []);
 ServiceContainer.addService(ErrorHandler, ['ZumitoFramework']);
-export { ZumitoFramework, Command, Module, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, CommandType, ButtonPressed, TextFormatter, EmojiFallback, DatabaseConfigLoader, discord, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator };
+export { ZumitoFramework, Command, Module, CommandArguments, FrameworkEvent, Translation, TranslationManager, ApiResponse, CommandType, ButtonPressed, TextFormatter, EmojiFallback, DatabaseConfigLoader, discord, ServiceContainer, GuildDataGetter, SlashCommandRefresher, CommandParser, ErrorHandler, ErrorType, Route, RouteMethod, InteractionHandler, CommandManager, InviteUrlGenerator, PrefixResolver, };

package/dist/services/SlashCommandRefresher.js

@@ -1,7 +1,7 @@
 import { REST } from '@discordjs/rest';
 import { Routes } from 'discord-api-types/v9';
 import { CommandType } from "../definitions/commands/CommandType";
-import { SlashCommandBuilder } from "discord.js";
+import { InteractionContextType, SlashCommandBuilder } from "discord.js";
 export class SlashCommandRefresher {
     framework;
     constructor(framework) {
@@ -34,6 +34,13 @@ export class SlashCommandRefresher {
         slashCommand
             .setName(command.name)
             .setDescription(this.framework.translations.get('command.' + command.name + '.description', 'en'));
+        if (slashCommand instanceof SlashCommandBuilder) {
+            slashCommand.setContexts([
+                InteractionContextType.BotDM,
+                InteractionContextType.Guild,
+                InteractionContextType.PrivateChannel,
+            ]);
+        }
         if (command.args) {
             command.args.forEach((arg) => {
                 let method;

package/dist/services/utilities/GuildDataGetter.js

@@ -30,15 +30,17 @@ export class GuildDataGetter {
     async getGuildSettings(guildId) {
         const collection = this.framework.database.collection('guilds');
         let guild = await collection.findOne({ guild_id: guildId });
-        guild = {
-            _id: new ObjectId(),
-            guild_id: guildId,
-            lang: 'en',
-            prefix: 'z-',
-            public: false,
-            deleteCommands: false
-        };
-        await collection.insertOne(guild);
+        if (!guild) {
+            guild = {
+                _id: new ObjectId(),
+                guild_id: guildId,
+                lang: 'en',
+                prefix: null,
+                public: false,
+                deleteCommands: false
+            };
+            await collection.insertOne(guild);
+        }
         return guild;
     }
 }

package/dist/services/utilities/PrefixResolver.d.ts

@@ -0,0 +1,20 @@
+import { ZumitoFramework } from "../../ZumitoFramework";
+import { GuildDataGetter } from "./GuildDataGetter";
+export declare class PrefixResolver {
+    private framework;
+    private guildDataGetter;
+    constructor(framework?: ZumitoFramework, guildDataGetter?: GuildDataGetter);
+    /**
+     * Resolve the prefix for a given context (guildId or DM).
+     * Priority:
+     *   1. Guild DB prefix (if exists and not null)
+     *   2. process.env.BOTPREFIX
+     *   3. framework.settings.defaultPrefix
+     *   4. 'z-'
+     * @param context { guildId?: string, userId?: string }
+     */
+    resolvePrefix(context: {
+        guildId?: string;
+        userId?: string;
+    }): Promise<string>;
+}

package/dist/services/utilities/PrefixResolver.js

@@ -0,0 +1,39 @@
+import { ZumitoFramework } from "../../ZumitoFramework";
+import { ServiceContainer } from "../ServiceContainer";
+import { GuildDataGetter } from "./GuildDataGetter";
+export class PrefixResolver {
+    framework;
+    guildDataGetter;
+    constructor(framework = ServiceContainer.getService(ZumitoFramework), guildDataGetter = ServiceContainer.getService(GuildDataGetter)) {
+        this.framework = framework;
+        this.guildDataGetter = guildDataGetter;
+    }
+    /**
+     * Resolve the prefix for a given context (guildId or DM).
+     * Priority:
+     *   1. Guild DB prefix (if exists and not null)
+     *   2. process.env.BOTPREFIX
+     *   3. framework.settings.defaultPrefix
+     *   4. 'z-'
+     * @param context { guildId?: string, userId?: string }
+     */
+    async resolvePrefix(context) {
+        // 1. Guild DB prefix
+        if (context.guildId) {
+            const guild = await this.guildDataGetter.getGuildSettings(context.guildId);
+            if (guild && guild.prefix) {
+                return guild.prefix;
+            }
+        }
+        // 2. Env var
+        if (process.env.DEFAULT_PREFIX) {
+            return process.env.DEFAULT_PREFIX;
+        }
+        // 3. Framework config
+        if (this.framework.settings?.defaultPrefix) {
+            return this.framework.settings.defaultPrefix;
+        }
+        // 4. Hardcoded fallback
+        return "z-";
+    }
+}

package/package.json

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