feat(language): allow language change in dms

Would-You-Bot · Apr 7, 2024 · 77d4111 · 77d4111
1 parent 5a76b01
commit 77d4111
Show file tree

Hide file tree

Showing 16 changed files with 156 additions and 125 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
diff --git a/src/buttons/gamesActivities/dare.ts b/src/buttons/gamesActivities/dare.ts
@@ -12,6 +12,7 @@ import shuffle from "../../util/shuffle";
 import { Button } from "../../interfaces";
 
 import { getDare } from "../../util/Functions/jsonImport";
+import { UserModel, IUserModel } from "../../util/Models/userModel";
 
 const button: Button = {
   name: "dare",
@@ -45,8 +46,10 @@ const button: Button = {
       }
     }
 
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let Dare = await getDare(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/buttons/gamesActivities/higherlower.ts b/src/buttons/gamesActivities/higherlower.ts
@@ -15,6 +15,7 @@ import { getHigherLower } from "../../util/Functions/jsonImport";
 import { HigherLowerEmbed } from "../../util/Defaults/Embeds/Games/HigherLowerEmbed";
 import { HigherlowerModel } from "../../util/Models/higherlowerModel";
 import HOR from "../../util/Classes/generateHOR";
+import { IUserModel, UserModel } from "../../util/Models/userModel";
 
 const button: Button = {
   name: "higherlower",
@@ -49,6 +50,8 @@ const button: Button = {
     }
     await interaction.deferReply();
 
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     const initembed = new HigherLowerEmbed(interaction, client, guildDb);
 
     await interaction.editReply({ embeds: [initembed] });
@@ -93,7 +96,7 @@ const button: Button = {
 
       .setDescription(
         `${client.translation.get(
-          guildDb?.language,
+          guildDb?.language != null ? guildDb.language : userDb.language,
           "HigherLower.description",
           {
             keyword: game.items.current.keyword,

diff --git a/src/buttons/gamesActivities/neverhaveiever.ts b/src/buttons/gamesActivities/neverhaveiever.ts
@@ -11,6 +11,7 @@ import shuffle from "../../util/shuffle";
 import { Button } from "../../interfaces";
 
 import { getNeverHaveIEver } from "../../util/Functions/jsonImport";
+import { UserModel, IUserModel } from "../../util/Models/userModel";
 
 const button: Button = {
   name: "neverhaveiever",
@@ -44,8 +45,10 @@ const button: Button = {
       }
     }
 
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let { Funny, Basic, Young, Food, RuleBreak } = await getNeverHaveIEver(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/commands/game/dare.ts b/src/commands/game/dare.ts
@@ -10,6 +10,7 @@ import shuffle from "../../util/shuffle";
 import { captureException } from "@sentry/node";
 import { ChatInputCommand } from "../../interfaces";
 import { getDare } from "../../util/Functions/jsonImport";
+import { UserModel, IUserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -29,8 +30,11 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let Dare = await getDare(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/commands/game/higherlower.ts b/src/commands/game/higherlower.ts
@@ -13,6 +13,7 @@ import { ChatInputCommand } from "../../interfaces";
 import { HigherlowerModel } from "../../util/Models/higherlowerModel";
 import { getHigherLower } from "../../util/Functions/jsonImport";
 import { HigherLowerEmbed } from "../../util/Defaults/Embeds/Games/HigherLowerEmbed";
+import { UserModel, IUserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -35,6 +36,8 @@ const command: ChatInputCommand = {
   execute: async (interaction, client, guildDb) => {
     await interaction.deferReply();
 
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     const initembed = new HigherLowerEmbed(interaction, client, guildDb);
 
     await interaction.editReply({ embeds: [initembed] });
@@ -79,7 +82,7 @@ const command: ChatInputCommand = {
 
       .setDescription(
         `${client.translation.get(
-          guildDb?.language,
+          guildDb?.language != null ? guildDb.language : userDb.language,
           "HigherLower.description",
           {
             keyword: game.items.current.keyword,

diff --git a/src/commands/game/leaderboard.ts b/src/commands/game/leaderboard.ts
@@ -1,7 +1,7 @@
 import { EmbedBuilder, SlashCommandBuilder } from "discord.js";
 import { ChatInputCommand } from "../../interfaces";
 import Paginator from "../../util/pagination";
-import { UserModel } from "../../util/Models/userModel";
+import { IUserModel, UserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -38,6 +38,10 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
+    let language = guildDb?.language != null ? guildDb.language : userDb.language;
+
     switch (interaction.options.getString("game")) {
       case "higherlower":
         const page = new Paginator({
@@ -67,7 +71,7 @@ const command: ChatInputCommand = {
             if (data.length === 0) {
               interaction.reply({
                 content: client.translation.get(
-                  guildDb?.language,
+                  language,
                   "Leaderboard.none",
                 ),
               });
@@ -79,11 +83,11 @@ const command: ChatInputCommand = {
                 `${i++}. ${
                   s.user === "Anonymous"
                     ? `${s.user} • **${s.score}** ${client.translation.get(
-                        guildDb?.language,
+                        language,
                         "Leaderboard.points",
                       )}`
                     : `<@${s.user}> • **${s.score}** ${client.translation.get(
-                        guildDb?.language,
+                        language,
                         "Leaderboard.points",
                       )}`
                 }`,
@@ -93,7 +97,7 @@ const command: ChatInputCommand = {
               new EmbedBuilder()
                 .setTitle(
                   client.translation.get(
-                    guildDb?.language,
+                    language,
                     "Leaderboard.global",
                   ),
                 )
@@ -113,7 +117,7 @@ const command: ChatInputCommand = {
                 new EmbedBuilder()
                   .setTitle(
                     client.translation.get(
-                      guildDb?.language,
+                      language,
                       "Leaderboard.global",
                     ),
                   )
@@ -144,7 +148,7 @@ const command: ChatInputCommand = {
             if (data.length === 0) {
               interaction.reply({
                 content: client.translation.get(
-                  guildDb?.language,
+                  language,
                   "Leaderboard.none",
                 ),
               });
@@ -156,11 +160,11 @@ const command: ChatInputCommand = {
                 `${i++}. ${
                   s.user === "Anonymous"
                     ? `${s.user} • **${s.score}** ${client.translation.get(
-                        guildDb?.language,
+                        language,
                         "Leaderboard.points",
                       )}`
                     : `<@${s.user}> • **${s.score}** ${client.translation.get(
-                        guildDb?.language,
+                        language,
                         "Leaderboard.points",
                       )}`
                 }`,
@@ -178,7 +182,7 @@ const command: ChatInputCommand = {
                 new EmbedBuilder()
                   .setTitle(
                     client.translation.get(
-                      guildDb?.language,
+                      language,
                       "Leaderboard.guild",
                     ),
                   )

diff --git a/src/commands/game/neverhaveiever.ts b/src/commands/game/neverhaveiever.ts
@@ -10,6 +10,7 @@ import { captureException } from "@sentry/node";
 import shuffle from "../../util/shuffle";
 import { ChatInputCommand } from "../../interfaces";
 import { getNeverHaveIEver } from "../../util/Functions/jsonImport";
+import { UserModel, IUserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -30,8 +31,11 @@ const command: ChatInputCommand = {
    */
 
   execute: async (interaction, client, guildDb) => {
+
+    let userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let { Funny, Basic, Young, Food, RuleBreak } = await getNeverHaveIEver(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/commands/game/random.ts b/src/commands/game/random.ts
@@ -10,6 +10,7 @@ import shuffle from "../../util/shuffle";
 import { captureException } from "@sentry/node";
 import { ChatInputCommand } from "../../interfaces";
 import { getRandomTod } from "../../util/Functions/jsonImport";
+import { UserModel, IUserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -30,8 +31,11 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let Randomtod = await getRandomTod(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/commands/game/truth.ts b/src/commands/game/truth.ts
@@ -10,6 +10,7 @@ import shuffle from "../../util/shuffle";
 import { captureException } from "@sentry/node";
 import { ChatInputCommand } from "../../interfaces";
 import { getTruth } from "../../util/Functions/jsonImport";
+import { UserModel, IUserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -29,8 +30,11 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let Truth = await getTruth(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/commands/game/whatwouldyoudo.ts b/src/commands/game/whatwouldyoudo.ts
@@ -10,6 +10,7 @@ import shuffle from "../../util/shuffle";
 import { captureException } from "@sentry/node";
 import { ChatInputCommand } from "../../interfaces";
 import { getWwyd } from "../../util/Functions/jsonImport";
+import { IUserModel, UserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -28,8 +29,11 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let WWYD = await getWwyd(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/commands/game/wouldyourather.ts b/src/commands/game/wouldyourather.ts
@@ -9,6 +9,7 @@ import { captureException } from "@sentry/node";
 import { ChatInputCommand } from "../../interfaces";
 import { getWouldYouRather } from "../../util/Functions/jsonImport";
 import { DefaultGameEmbed } from "../../util/Defaults/Embeds/Games/DefaultGameEmbed";
+import { IUserModel, UserModel } from "../../util/Models/userModel";
 
 const command: ChatInputCommand = {
   requireGuild: true,
@@ -29,8 +30,11 @@ const command: ChatInputCommand = {
    */
 
   execute: async (interaction, client, guildDb) => {
+
+    const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
+
     let General = await getWouldYouRather(
-      guildDb?.language != null ? guildDb.language : "en_EN",
+      guildDb?.language != null ? guildDb.language : userDb.language,
     );
 
     let dbquestions;

diff --git a/src/commands/index.ts b/src/commands/index.ts
@@ -72,6 +72,7 @@ const commandInteractionEvent: Event = {
         "whatwouldyoudo",
         "leaderboard",
         "privacy",
+        "language",
       ];
       if (
         !interaction.guild &&