Merge pull request #285 from Welcome-Bot/dev

fix(lang): fix bug not replying after setting language

Author: Puneet Gopinath

.github/workflows/publish-dev.yml

@@ -19,9 +19,9 @@ jobs:
         run: npm ci --ignore-scripts
 
       #- name: Deprecate old versions
-        #run: npm deprecate welcome-bot@"~$(jq --raw-output '.version' package.json)" "no longer supported" || true
-        #env:
-          #NODE_AUTH_TOKEN: {{ secrets.npm_token }}
+      #run: npm deprecate welcome-bot@"~$(jq --raw-output '.version' package.json)" "no longer supported" || true
+      #env:
+      #NODE_AUTH_TOKEN: {{ secrets.npm_token }}
 
       - name: Publish
         run: |

CHANGELOG.md

@@ -8,12 +8,20 @@ The displayed date is in the format `DD-MM-YYYY`
 
 [Legend](#legend)
 
-## [v2.0.2]
+## [v2.0.3]
 
 > **Released:** `TBA`
 
 ### Changes
 
+- fix(lang): fix bug not replying after setting language
+
+## [v2.0.2]
+
+> **Released:** `19-09-2021`
+
+### Changes
+
 - fix(translation): whitelist telugu
 
 ## [v2.0.1]
@@ -89,6 +97,7 @@ The displayed date is in the format `DD-MM-YYYY`
 - refactor(translations): Lot more translations
 - refactor: remove pokemon, image commands
 
+[v2.0.3]: https://github.com/Welcome-Bot/welcome-bot/releases/tag/v2.0.3
 [v2.0.2]: https://github.com/Welcome-Bot/welcome-bot/releases/tag/v2.0.2
 [v2.0.1]: https://github.com/Welcome-Bot/welcome-bot/releases/tag/v2.0.1
 [v2.0.0]: https://github.com/Welcome-Bot/welcome-bot/releases/tag/v2.0.0

package.json

@@ -1,9 +1,9 @@
 {
   "name": "welcome-bot",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "changelog": [
     "**Changes**",
-    "fix(translation): whitelist Telugu"
+    "fix(lang): fix bug not replying after setting language"
   ],
   "description": "A multi-purpose discord bot that helps you monitor (welcome and goodbye logs), moderate (kick or ban users who spam your server), etc...",
   "main": "src/shard.js",

src/classes/Embed.js

@@ -7,6 +7,7 @@ const { MessageEmbed } = require("discord.js");
 module.exports = class Embed extends MessageEmbed {
     constructor(opts = {}, data = {}) {
         super(data);
+        this.setDesc = this.setDescription;
         let { color = null } = opts;
         const {
             tag = null,
@@ -46,8 +47,4 @@ module.exports = class Embed extends MessageEmbed {
         if (footer) this.setFooter(`${footer}`);
         if (timestamp) this.setTimestamp();
     }
-
-    setDesc(description) {
-        return this.setDescription(description);
-    }
 };

src/commands/admin/lang.js

@@ -23,7 +23,7 @@ module.exports = class CMD extends Command {
                     { name: "set", desc: "Set language" },
                 ],
                 disabled: false,
-                cooldown: 10,
+                cooldown: 4,
                 category: "Administration",
             },
             client
@@ -38,11 +38,13 @@ module.exports = class CMD extends Command {
             str += `\`${l}\` - ${list[l]}\n`;
         }
         if (args[1]) args[1] = args[1].toLowerCase();
-        const language = this.client.languages.find(
-            (l) => l.name === args[1] || l.aliases.includes(args[1])
-        )?.name;
+        let lang, language;
         switch (args[0]) {
             case "set":
+                lang = this.client.languages.find(
+                    (l) => l.name === args[1] || l.aliases.includes(args[1])
+                );
+                language = lang?.name;
                 if (!args[1]) {
                     return message.reply(t("cmds:lang.langNotProvided"));
                 }
@@ -55,7 +57,7 @@ module.exports = class CMD extends Command {
                 await updateGuild(message.guild.id, "lang", language);
                 return message.reply(
                     t("cmds:lang.success", {
-                        lang: `${language.aliases[0]} (${args[1]})`,
+                        lang: `${lang.aliases[0]} (${args[1]})`,
                     })
                 );
                 break;
@@ -65,10 +67,15 @@ module.exports = class CMD extends Command {
                 });
                 break;
             default:
+                lang = this.client.languages.find(
+                    (l) =>
+                        l.name === guildDB.lang ||
+                        l.aliases.includes(guildDB.lang)
+                );
                 return message.reply({
                     embeds: [
                         embed.setDesc(
-                            t("cmds:lang.show", { lang: guildDB.lang })
+                            t("cmds:lang.show", { lang: lang.aliases[0] })
                         ),
                     ],
                 });