spacecommands 3.4.8 → 3.5.0

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);
+                }
             }
         })();
     }
@@ -70,9 +77,38 @@ class MessageHandler {
     async setLanguage(guild, language) {
         if (guild) {
             this._guildLanguages.set(guild.id, language);
+            if (this._instance.isDBConnected()) {
+                await languages_1.default.findOneAndUpdate({
+                    _id: guild.id,
+                }, {
+                    _id: guild.id,
+                    language,
+                }, {
+                    upsert: true,
+                });
+            }
         }
     }
-    getLanguage(guild) {
+    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;
+            }
+        }
         if (guild) {
             const result = this._guildLanguages.get(guild.id);
             if (result) {
@@ -81,8 +117,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}"`);
@@ -95,8 +131,8 @@ class MessageHandler {
         }
         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.4.8",
+  "version": "3.5.0",
   "main": "dist/index.js",
   "types": "./typings.d.ts",
   "typings": "./typings.d.ts",