spacecommands 3.4.0 → 3.4.2

package/README.md

@@ -55,7 +55,6 @@ client.on('ready', () => {
     featuresDir: path.join(__dirname, 'features'),
     testServers: ['YOUR_TEST_SERVER_ID'],
     botOwners: ['YOUR_USER_ID'],
-    premiumServers: ['YOUR_PREMIUM_SERVER_ID'],
     // Database (optional - Supabase recommended)
     supabaseUrl: process.env.SUPABASE_URL,
     supabaseKey: process.env.SUPABASE_KEY,
@@ -67,7 +66,7 @@ client.login(process.env.BOT_TOKEN);
 
 ## Supabase Setup (Recommended)
 
-SpaceCommands uses Supabase for data persistence. Here's how to set it up:
+SpaceCommands now uses Supabase for data persistence instead of MongoDB. Here's how to set it up:
 
 ### 1. Create a Supabase Project
 

package/dist/CommandHandler.js

@@ -52,9 +52,6 @@ class CommandHandler {
             if (disabledDefaultCommands.includes(fileName)) {
                 continue;
             }
-            if (instance.debug) {
-                console.log(`SpaceCommands > Registering internal command: ${fileName}`);
-            }
             await this.registerCommand(instance, client, file, fileName, true);
         }
         // Do not pass in TS here because this should always compiled to JS
@@ -69,9 +66,6 @@ class CommandHandler {
             const amount = files.length;
             console.log(`SpaceCommands > Loaded ${amount} command${amount === 1 ? '' : 's'}.`);
             for (const [file, fileName] of files) {
-                if (instance.debug) {
-                    console.log(`SpaceCommands > Registering command file: ${fileName}`);
-                }
                 await this.registerCommand(instance, client, file, fileName);
             }
             if (instance.isDBConnected()) {
@@ -143,7 +137,7 @@ class CommandHandler {
                         });
                     }
                     else {
-                        message.reply(instance.messageHandler.get(guild, 'EXCEPTION', {}, message.author));
+                        message.reply(instance.messageHandler.get(guild, 'EXCEPTION'));
                         console.error(e);
                     }
                     instance.emit(Events_1.default.COMMAND_EXCEPTION, command, message, e);
@@ -166,6 +160,15 @@ class CommandHandler {
         }
         const { name = fileName, category, commands, aliases, init, callback, run, execute, error, description, requiredPermissions, permissions, slash, expectedArgs, expectedArgsTypes, minArgs, options = [], autocomplete, } = configuration;
         const { testOnly } = configuration;
+        // Extract options from SlashCommandBuilder if using data property
+        // This allows commands to use SlashCommandBuilder pattern while still working with SpaceCommands
+        let finalOptions = options;
+        if (configuration.data && configuration.data.options) {
+            finalOptions = configuration.data.options;
+            if (instance.debug) {
+                console.log(`SpaceCommands > Command "${name || fileName}" using SlashCommandBuilder with ${finalOptions.length} options`);
+            }
+        }
         if (run || execute) {
             throw new Error(`Command located at "${file}" has either a "run" or "execute" function. Please rename that function to "callback".`);
         }
@@ -207,7 +210,7 @@ class CommandHandler {
         if (slash !== undefined && typeof slash !== 'boolean' && slash !== 'both') {
             throw new Error(`SpaceCommands > Command "${names[0]}" has a "slash" property that is not boolean "true" or string "both".`);
         }
-        if (!slash && options.length) {
+        if (!slash && finalOptions.length) {
             throw new Error(`SpaceCommands > Command "${names[0]}" has an "options" property but is not a slash command.`);
         }
         if (slash && !(builtIn && !instance.isDBConnected())) {
@@ -217,9 +220,9 @@ class CommandHandler {
             if (minArgs !== undefined && !expectedArgs) {
                 throw new Error(`SpaceCommands > Command "${names[0]}" has "minArgs" property defined without "expectedArgs" property as a slash command.`);
             }
-            if (options.length) {
-                for (const key in options) {
-                    const name = options[key].name;
+            if (finalOptions.length) {
+                for (const key in finalOptions) {
+                    const name = finalOptions[key].name;
                     let lowerCase = name.toLowerCase();
                     if (name !== lowerCase && instance.showWarns) {
                         console.log(`SpaceCommands > Command "${names[0]}" has an option of "${name}". All option names must be lower case for slash commands. SpaceCommands will modify this for you.`);
@@ -228,7 +231,7 @@ class CommandHandler {
                         lowerCase = lowerCase.replace(/\s/g, '_');
                         console.log(`SpaceCommands > Command "${names[0]}" has an option of "${name}" with a white space in it. It is a best practice for option names to only be one word. SpaceCommands will modify this for you.`);
                     }
-                    options[key].name = lowerCase;
+                    finalOptions[key].name = lowerCase;
                 }
             }
             else if (expectedArgs) {
@@ -237,12 +240,12 @@ class CommandHandler {
                     .split(/[>\]] [<\[]/);
                 for (let a = 0; a < split.length; ++a) {
                     const item = split[a];
-                    options.push({
+                    finalOptions.push({
                         name: item.replace(/ /g, '-').toLowerCase(),
                         description: item,
                         type: expectedArgsTypes && expectedArgsTypes.length >= a
                             ? expectedArgsTypes[a]
-                            : 3,
+                            : 'STRING',
                         required: a < minArgs,
                     });
                 }
@@ -250,11 +253,11 @@ class CommandHandler {
             const slashCommands = instance.slashCommands;
             if (testOnly) {
                 for (const id of instance.testServers) {
-                    await slashCommands.create(names[0], description, options, id);
+                    await slashCommands.create(names[0], description, finalOptions, id);
                 }
             }
             else {
-                await slashCommands.create(names[0], description, options);
+                await slashCommands.create(names[0], description, finalOptions);
             }
             if (autocomplete) {
                 const slashCommands = instance.slashCommands;

package/dist/SlashCommands.js

@@ -72,7 +72,7 @@ class SlashCommands {
                 const command = this._instance.commandHandler.getCommand(commandName);
                 if (!command) {
                     interaction.reply({
-                        content: this._instance.messageHandler.get(guild, 'INVALID_SLASH_COMMAND', {}, interaction.user),
+                        content: this._instance.messageHandler.get(guild, 'INVALID_SLASH_COMMAND'),
                         ephemeral: this._instance.ephemeral,
                     });
                     return;

package/dist/command-checks/has-entitlement.js

@@ -5,12 +5,6 @@ module.exports = async (guild, command, instance, member, user, reply) => {
     if (!requiredEntitlements.length && !premiumOnly) {
         return true;
     }
-    if (guild && instance.premiumServers.includes(guild.id)) {
-        return true;
-    }
-    else if (guild) {
-        console.log(`[EntitlementCheck] Guild ${guild.id} NOT in premium list:`, instance.premiumServers);
-    }
     const entitlementHandler = instance.entitlementHandler;
     if (!entitlementHandler) {
         console.warn('SpaceCommands > Command requires entitlements but EntitlementHandler is not initialized.');
@@ -19,12 +13,7 @@ module.exports = async (guild, command, instance, member, user, reply) => {
     // Check if user has required entitlements
     if (requiredEntitlements.length > 0) {
         const { hasEntitlement } = await entitlementHandler.hasAnyEntitlement(user.id, requiredEntitlements);
-        let hasAccess = hasEntitlement;
-        if (!hasAccess && guild) {
-            const { hasEntitlement: hasGuildEntitlement } = await entitlementHandler.hasAnyGuildEntitlement(guild.id, requiredEntitlements);
-            hasAccess = hasGuildEntitlement;
-        }
-        if (!hasAccess) {
+        if (!hasEntitlement) {
             reply(instance.messageHandler.get(guild, 'MISSING_ENTITLEMENT') ||
                 'You need a premium subscription to use this command.').then((message) => {
                 if (!message) {
@@ -43,12 +32,7 @@ module.exports = async (guild, command, instance, member, user, reply) => {
     // If premiumOnly is set, check for any active entitlement
     if (premiumOnly) {
         const allEntitlements = await entitlementHandler.getUserEntitlements(user.id);
-        let hasPremium = allEntitlements.length > 0;
-        if (!hasPremium && guild) {
-            const guildEntitlements = await entitlementHandler.getGuildEntitlements(guild.id);
-            hasPremium = guildEntitlements.length > 0;
-        }
-        if (!hasPremium) {
+        if (allEntitlements.length === 0) {
             reply(instance.messageHandler.get(guild, 'PREMIUM_ONLY') ||
                 'This command is only available to premium subscribers.').then((message) => {
                 if (!message) {

package/dist/command-checks/has-permissions.js

@@ -20,7 +20,7 @@ module.exports = (guild, command, instance, member, user, reply) => {
             else {
                 reply(instance.messageHandler.get(guild, 'MISSING_PERMISSION', {
                     PERM: perm,
-                }, user)).then((message) => {
+                })).then((message) => {
                     if (!message) {
                         return;
                     }

package/dist/commands/command.js

@@ -12,7 +12,6 @@ module.exports = {
     maxArgs: 2,
     expectedArgs: '<"enable" or "disable"> <Command Name>',
     cooldown: '2s',
-    guildOnly: true,
     slash: 'both',
     options: [
         {

package/dist/commands/prefix.js

@@ -10,7 +10,6 @@ module.exports = {
     maxArgs: 1,
     expectedArgs: '[prefix]',
     cooldown: '2s',
-    guildOnly: true,
     slash: 'both',
     options: [
         {

package/dist/commands/requiredrole.js

@@ -11,7 +11,6 @@ module.exports = {
     minArgs: 2,
     maxArgs: 2,
     expectedArgs: '<command> <none-or-roleid>',
-    guildOnly: true,
     cooldown: '2s',
     slash: 'both',
     callback: async (options) => {

package/dist/commands/slash.js

@@ -6,7 +6,6 @@ module.exports = {
     permissions: ['Administrator'],
     maxArgs: 1,
     expectedArgs: '[command-id]',
-    guildOnly: true,
     ownerOnly: true,
     hidden: true,
     slash: 'both',

package/dist/handlers/EntitlementHandler.js

@@ -79,17 +79,6 @@ class EntitlementHandler {
             entitlement,
         };
     }
-    /**
-     * Check if a guild has any of the specified entitlements
-     */
-    async hasAnyGuildEntitlement(guildId, skuIds) {
-        const entitlements = await this.getGuildEntitlements(guildId);
-        const entitlement = entitlements.find((e) => skuIds.includes(e.skuId));
-        return {
-            hasEntitlement: !!entitlement,
-            entitlement,
-        };
-    }
     /**
      * Check if a user has all of the specified entitlements
      */

package/dist/handlers/ModalHandler.js

@@ -32,7 +32,7 @@ class ModalHandler {
         for (const [file, fileName] of files) {
             const handler = require(file);
             const config = handler.default || handler;
-            if (config.type === 'modal' || (config.customId && config.callback)) {
+            if (config.type === 'modal') {
                 this.registerModalHandler(config);
             }
         }

package/dist/index.js

@@ -36,7 +36,6 @@ class SpaceCommands extends events_1.EventEmitter {
     _ignoreBots = true;
     _botOwner = [];
     _testServers = [];
-    _premiumServers = [];
     _defaultLanguage = 'english';
     _ephemeral = true;
     _debug = false;
@@ -99,12 +98,6 @@ class SpaceCommands extends events_1.EventEmitter {
             }
             this._botOwner = botOwners;
         }
-        if (options.premiumServers) {
-            if (typeof options.premiumServers === 'string') {
-                options.premiumServers = [options.premiumServers];
-            }
-            this._premiumServers = options.premiumServers;
-        }
         this._showWarns = showWarns;
         this._delErrMsgCooldown = delErrMsgCooldown;
         this._defaultLanguage = defaultLanguage.toLowerCase();
@@ -276,9 +269,6 @@ class SpaceCommands extends events_1.EventEmitter {
     get testServers() {
         return this._testServers;
     }
-    get premiumServers() {
-        return this._premiumServers;
-    }
     get defaultLanguage() {
         return this._defaultLanguage;
     }

package/dist/message-handler.js

@@ -37,12 +37,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const languages_1 = __importDefault(require("./models/languages"));
-const user_languages_1 = __importDefault(require("./models/user-languages"));
 const defualtMessages = require('../messages.json');
 class MessageHandler {
     _instance;
     _guildLanguages = new Map(); // <Guild ID, Language>
-    _userLanguages = new Map(); // <User ID, Language>
     _languages = [];
     _messages = {};
     constructor(instance, messagePath) {
@@ -63,11 +61,6 @@ class MessageHandler {
                 for (const { _id: guildId, language } of results) {
                     this._guildLanguages.set(guildId, language);
                 }
-                const userResults = await user_languages_1.default.find();
-                // @ts-ignore
-                for (const { _id: userId, language } of userResults) {
-                    this._userLanguages.set(userId, language);
-                }
             }
         })();
     }
@@ -79,26 +72,7 @@ class MessageHandler {
             this._guildLanguages.set(guild.id, language);
         }
     }
-    async setUserLanguage(user, language) {
-        this._userLanguages.set(user.id, language);
-        if (this._instance.isDBConnected()) {
-            await user_languages_1.default.findOneAndUpdate({
-                _id: user.id,
-            }, {
-                _id: user.id,
-                language,
-            }, {
-                upsert: true,
-            });
-        }
-    }
-    getLanguage(guild, user) {
-        if (user) {
-            const userLang = this._userLanguages.get(user.id);
-            if (userLang) {
-                return userLang;
-            }
-        }
+    getLanguage(guild) {
         if (guild) {
             const result = this._guildLanguages.get(guild.id);
             if (result) {
@@ -107,8 +81,8 @@ class MessageHandler {
         }
         return this._instance.defaultLanguage;
     }
-    get(guild, messageId, args = {}, user) {
-        const language = this.getLanguage(guild, user);
+    get(guild, messageId, args = {}) {
+        const language = this.getLanguage(guild);
         const translations = this._messages[messageId];
         if (!translations) {
             console.error(`SpaceCommands > Could not find the correct message to send for "${messageId}"`);
@@ -117,12 +91,12 @@ class MessageHandler {
         let result = translations[language];
         for (const key of Object.keys(args)) {
             const expression = new RegExp(`{${key}}`, 'g');
-            result = result?.replace(expression, args[key]);
+            result = result.replace(expression, args[key]);
         }
         return result;
     }
-    getEmbed(guild, embedId, itemId, args = {}, user) {
-        const language = this.getLanguage(guild, user);
+    getEmbed(guild, embedId, itemId, args = {}) {
+        const language = this.getLanguage(guild);
         const items = this._messages[embedId];
         if (!items) {
             console.error(`SpaceCommands > Could not find the correct item to send for "${embedId}" -> "${itemId}"`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacecommands",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "main": "dist/index.js",
   "types": "./typings.d.ts",
   "typings": "./typings.d.ts",

package/dist/commands/delete_command.js

@@ -1,74 +0,0 @@
-"use strict";
-module.exports = {
-    description: 'Deletes a slash command by name from Discord (Development Tool)',
-    category: 'Development',
-    minArgs: 1,
-    expectedArgs: '<command_name> [guild_id]',
-    ownerOnly: true,
-    testOnly: true, // Visible immediately
-    slash: 'both',
-    options: [
-        {
-            name: 'command_name',
-            description: 'The name of the command to delete (case insensitive)',
-            type: 3, // STRING
-            required: true,
-        },
-        {
-            name: 'scope',
-            description: 'Where to delete from',
-            type: 3, // STRING
-            required: false,
-            choices: [
-                { name: 'Global', value: 'global' },
-                { name: 'Current Server', value: 'guild' },
-                { name: 'All Servers (Dangerous)', value: 'all' }
-            ]
-        }
-    ],
-    callback: async (options) => {
-        const { instance, args, interaction, guild, client } = options;
-        const commandName = args[0].toLowerCase();
-        const scope = args[1] || 'global';
-        let deletedCount = 0;
-        let status = [];
-        // Helper to delete from a command manager
-        const deleteFromManager = async (manager, sourceName) => {
-            try {
-                const commands = await manager.fetch();
-                const cmd = commands.find((c) => c.name.toLowerCase() === commandName);
-                if (cmd) {
-                    await manager.delete(cmd.id);
-                    status.push(`✅ Deleted **${cmd.name}** from ${sourceName}`);
-                    deletedCount++;
-                }
-                else {
-                    // status.push(`⚠️ Could not find **${commandName}** in ${sourceName}`)
-                }
-            }
-            catch (err) {
-                status.push(`❌ Error handling ${sourceName}: ${err.message}`);
-            }
-        };
-        if (scope === 'global') {
-            await deleteFromManager(client.application?.commands, 'Global');
-        }
-        if (scope === 'guild' || scope === 'all') {
-            if (guild && scope === 'guild') {
-                await deleteFromManager(guild.commands, `Guild: ${guild.name}`);
-            }
-            else if (scope === 'all') {
-                // Iterate all guilds the bot is in
-                const guilds = client.guilds.cache;
-                status.push(`🔄 Scanning ${guilds.size} guilds...`);
-                for (const [id, g] of guilds) {
-                    await deleteFromManager(g.commands, `Guild: ${g.name}`);
-                }
-            }
-        }
-        if (deletedCount === 0 && status.length === 0) {
-            return `Could not find any command named "${commandName}" to delete in scope "${scope}".`;
-        }
-        return status.join('\n') || `Operation complete. Deleted ${deletedCount} instances.`;
-    }
-};

package/dist/commands/mylanguage.js

@@ -1,51 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const Events_1 = __importDefault(require("../enums/Events"));
-module.exports = {
-    description: 'Displays or sets your personal language preference',
-    category: 'Configuration',
-    aliases: ['mylang'],
-    maxArgs: 1,
-    expectedArgs: '[language]',
-    testOnly: true,
-    cooldown: '2s',
-    options: [
-        {
-            name: 'language',
-            description: 'The language to set for yourself',
-            type: 3, // STRING
-            required: false,
-        },
-    ],
-    slash: 'both',
-    callback: async (options) => {
-        const { channel, text, instance, user } = options;
-        const { guild } = channel;
-        // Allow in DMs
-        // if (!guild) {
-        //   return
-        // }
-        const { messageHandler } = instance;
-        if (!instance.isDBConnected()) {
-            return instance.messageHandler.get(guild, 'NO_DATABASE_FOUND', {}, user);
-        }
-        const lang = text.toLowerCase();
-        if (!lang) {
-            return instance.messageHandler.get(guild, 'CURRENT_LANGUAGE', {
-                LANGUAGE: instance.messageHandler.getLanguage(guild, user),
-            }, user);
-        }
-        if (!messageHandler.languages().includes(lang)) {
-            instance.emit(Events_1.default.LANGUAGE_NOT_SUPPORTED, guild, lang);
-            return messageHandler.get(guild, 'LANGUAGE_NOT_SUPPORTED', {
-                LANGUAGE: lang,
-            }, user);
-        }
-        await instance.messageHandler.setUserLanguage(user, lang);
-        return instance.messageHandler.get(guild, 'NEW_LANGUAGE', {
-            LANGUAGE: lang,
-        }, user);
-    },
-};

package/dist/models/user-languages.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const supabase_1 = require("../supabase");
-const TABLE_NAME = 'spacecommands_user_languages';
-exports.default = {
-    async find(filter = {}) {
-        const client = (0, supabase_1.getSupabaseClient)();
-        if (!client)
-            return [];
-        let query = client.from(TABLE_NAME).select('*');
-        if (filter._id) {
-            query = query.eq('user_id', filter._id);
-        }
-        const { data, error } = await query;
-        if (error) {
-            console.error('SpaceCommands > Error fetching user languages:', error);
-            return [];
-        }
-        return (data || []).map((row) => ({
-            _id: row.user_id,
-            language: row.language,
-        }));
-    },
-    async findOne(filter) {
-        const client = (0, supabase_1.getSupabaseClient)();
-        if (!client)
-            return null;
-        const { data, error } = await client
-            .from(TABLE_NAME)
-            .select('*')
-            .eq('user_id', filter._id)
-            .single();
-        if (error) {
-            if (error.code === 'PGRST116')
-                return null;
-            console.error('SpaceCommands > Error finding user language:', error);
-            return null;
-        }
-        return {
-            _id: data.user_id,
-            language: data.language,
-        };
-    },
-    async findOneAndUpdate(filter, update, options = {}) {
-        const client = (0, supabase_1.getSupabaseClient)();
-        if (!client)
-            return null;
-        const userId = filter._id;
-        const language = update.language || update.$set?.language;
-        const { data, error } = await client
-            .from(TABLE_NAME)
-            .upsert({ user_id: userId, language }, { onConflict: 'user_id' })
-            .select()
-            .single();
-        if (error) {
-            console.error('SpaceCommands > Error upserting user language:', error);
-            return null;
-        }
-        return {
-            _id: data.user_id,
-            language: data.language,
-        };
-    },
-};