spacecommands 3.1.0 → 3.2.0

package/README.md

@@ -55,6 +55,7 @@ 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,
@@ -66,7 +67,7 @@ client.login(process.env.BOT_TOKEN);
 
 ## Supabase Setup (Recommended)
 
-SpaceCommands now uses Supabase for data persistence instead of MongoDB. Here's how to set it up:
+SpaceCommands uses Supabase for data persistence. Here's how to set it up:
 
 ### 1. Create a Supabase Project
 

package/dist/CommandHandler.js

@@ -137,7 +137,7 @@ class CommandHandler {
                         });
                     }
                     else {
-                        message.reply(instance.messageHandler.get(guild, 'EXCEPTION'));
+                        message.reply(instance.messageHandler.get(guild, 'EXCEPTION', {}, message.author));
                         console.error(e);
                     }
                     instance.emit(Events_1.default.COMMAND_EXCEPTION, command, message, e);

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'),
+                        content: this._instance.messageHandler.get(guild, 'INVALID_SLASH_COMMAND', {}, interaction.user),
                         ephemeral: this._instance.ephemeral,
                     });
                     return;

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

@@ -5,6 +5,9 @@ module.exports = async (guild, command, instance, member, user, reply) => {
     if (!requiredEntitlements.length && !premiumOnly) {
         return true;
     }
+    if (guild && instance.premiumServers.includes(guild.id)) {
+        return true;
+    }
     const entitlementHandler = instance.entitlementHandler;
     if (!entitlementHandler) {
         console.warn('SpaceCommands > Command requires entitlements but EntitlementHandler is not initialized.');
@@ -13,7 +16,12 @@ 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);
-        if (!hasEntitlement) {
+        let hasAccess = hasEntitlement;
+        if (!hasAccess && guild) {
+            const { hasEntitlement: hasGuildEntitlement } = await entitlementHandler.hasAnyGuildEntitlement(guild.id, requiredEntitlements);
+            hasAccess = hasGuildEntitlement;
+        }
+        if (!hasAccess) {
             reply(instance.messageHandler.get(guild, 'MISSING_ENTITLEMENT') ||
                 'You need a premium subscription to use this command.').then((message) => {
                 if (!message) {
@@ -32,7 +40,12 @@ 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);
-        if (allEntitlements.length === 0) {
+        let hasPremium = allEntitlements.length > 0;
+        if (!hasPremium && guild) {
+            const guildEntitlements = await entitlementHandler.getGuildEntitlements(guild.id);
+            hasPremium = guildEntitlements.length > 0;
+        }
+        if (!hasPremium) {
             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,
-                })).then((message) => {
+                }, user)).then((message) => {
                     if (!message) {
                         return;
                     }

package/dist/commands/mylanguage.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+// @ts-nocheck
+const user_languages_1 = __importDefault(require("../models/user-languages"));
+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]',
+    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);
+        }
+        instance.messageHandler.setUserLanguage(user, lang);
+        await user_languages_1.default.findOneAndUpdate({
+            _id: user.id,
+        }, {
+            _id: user.id,
+            language: lang,
+        }, {
+            upsert: true,
+        });
+        return instance.messageHandler.get(guild, 'NEW_LANGUAGE', {
+            LANGUAGE: lang,
+        }, user);
+    },
+};

package/dist/handlers/ContextMenuHandler.js

@@ -69,7 +69,7 @@ class ContextMenuHandler {
             !this._instance.botOwner.includes(interaction.user.id)) {
             await interaction.reply({
                 content: 'This command is only available to bot owners.',
-                ephemeral: true,
+                flags: discord_js_1.MessageFlags.Ephemeral,
             });
             return;
         }
@@ -77,7 +77,7 @@ class ContextMenuHandler {
         if (command.guildOnly && !interaction.guild) {
             await interaction.reply({
                 content: 'This command can only be used in servers.',
-                ephemeral: true,
+                flags: discord_js_1.MessageFlags.Ephemeral,
             });
             return;
         }
@@ -88,7 +88,7 @@ class ContextMenuHandler {
             if (!hasPermission) {
                 await interaction.reply({
                     content: 'You do not have permission to use this command.',
-                    ephemeral: true,
+                    flags: discord_js_1.MessageFlags.Ephemeral,
                 });
                 return;
             }
@@ -101,7 +101,7 @@ class ContextMenuHandler {
             if (!interaction.replied && !interaction.deferred) {
                 await interaction.reply({
                     content: 'An error occurred while executing this command.',
-                    ephemeral: true,
+                    flags: discord_js_1.MessageFlags.Ephemeral,
                 });
             }
         }

package/dist/handlers/EntitlementHandler.js

@@ -79,6 +79,17 @@ 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/index.js

@@ -36,6 +36,7 @@ class SpaceCommands extends events_1.EventEmitter {
     _ignoreBots = true;
     _botOwner = [];
     _testServers = [];
+    _premiumServers = [];
     _defaultLanguage = 'english';
     _ephemeral = true;
     _debug = false;
@@ -98,6 +99,12 @@ 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();
@@ -269,6 +276,9 @@ 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,10 +37,12 @@ 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) {
@@ -61,6 +63,11 @@ 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);
+                }
             }
         })();
     }
@@ -72,7 +79,16 @@ class MessageHandler {
             this._guildLanguages.set(guild.id, language);
         }
     }
-    getLanguage(guild) {
+    async setUserLanguage(user, language) {
+        this._userLanguages.set(user.id, language);
+    }
+    getLanguage(guild, user) {
+        if (user) {
+            const userLang = this._userLanguages.get(user.id);
+            if (userLang) {
+                return userLang;
+            }
+        }
         if (guild) {
             const result = this._guildLanguages.get(guild.id);
             if (result) {
@@ -81,8 +97,8 @@ class MessageHandler {
         }
         return this._instance.defaultLanguage;
     }
-    get(guild, messageId, args = {}) {
-        const language = this.getLanguage(guild);
+    get(guild, messageId, args = {}, user) {
+        const language = this.getLanguage(guild, user);
         const translations = this._messages[messageId];
         if (!translations) {
             console.error(`SpaceCommands > Could not find the correct message to send for "${messageId}"`);
@@ -91,12 +107,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 = {}) {
-        const language = this.getLanguage(guild);
+    getEmbed(guild, embedId, itemId, args = {}, user) {
+        const language = this.getLanguage(guild, user);
         const items = this._messages[embedId];
         if (!items) {
             console.error(`SpaceCommands > Could not find the correct item to send for "${embedId}" -> "${itemId}"`);

package/dist/models/user-languages.js

@@ -0,0 +1,65 @@
+"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,
+        };
+    },
+};

package/package.json

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