v4.12.4 - Bug fix no event de erro duplicado

alanfilho184 · Mar 27, 2024 · 8693ada · 8693ada
1 parent 018476e
commit 8693ada
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kami",
-  "version": "4.12.3",
+  "version": "4.12.4",
   "description": "Um BOT para Discord com foco em ajudar em mesas de RPG online, tendo suas principais funções criar fichas e rolar dados.",
   "main": "index.js",
   "scripts": {

diff --git a/src/client.js b/src/client.js
@@ -121,7 +121,7 @@ module.exports = class MenuClient extends Discord.Client {
                 logging: false,
                 dialect: "postgres",
             }
-        
+
             if (process.env.NODE_ENV == "production") {
                 conStr["dialectOptions"] = {
                     ssl: {
@@ -130,7 +130,7 @@ module.exports = class MenuClient extends Discord.Client {
                     }
                 }
             }
-        
+
             return conStr
         }
 
@@ -162,9 +162,7 @@ module.exports = class MenuClient extends Discord.Client {
             if (err == "TypeError: Cannot read property 'send' of null") {
                 process.exit(1)
             }
-            else if (err != "DiscordAPIError: Unknown interaction") {
-                this.emit("err", err, true)
-            }
+
             logs.log.error(err, true)
 
             errorStack++
@@ -179,9 +177,7 @@ module.exports = class MenuClient extends Discord.Client {
             if (err == "TypeError: Cannot read property 'send' of null") {
                 process.exit(1)
             }
-            else if (err != "DiscordAPIError: Unknown interaction") {
-                this.emit("err", err, true)
-            }
+
             logs.log.error(err, true)
 
             errorStack++
@@ -201,7 +197,6 @@ module.exports = class MenuClient extends Discord.Client {
             })
 
         })
-
     }
 
     setCache() {
@@ -264,7 +259,7 @@ module.exports = class MenuClient extends Discord.Client {
         }
     }
 
-    setWebSocket(){
+    setWebSocket() {
         const ws = require("./modules/websocket/server")
         new ws(this)
     }

diff --git a/src/events/discord/interactionCreate.js b/src/events/discord/interactionCreate.js
@@ -36,7 +36,25 @@ module.exports = {
                 return int.reply({ embeds: [disableEmbed], ephemeral: true })
             }
             else {
-                client.on("err", (err, logged) => {
+                try {
+                    cmd.run(client, int)
+                        .catch(err => {
+                            client.log.error(err, true)
+                            if (int.deferred) {
+                                if (int.replied) {
+                                    return
+                                }
+                                else {
+                                    return int.editReply({ content: client.tl({ local: int.lang + "intCreate-onErr" }), ephemeral: true })
+                                }
+                            }
+                            else {
+                                return int.reply({ content: client.tl({ local: int.lang + "intCreate-onErr" }), ephemeral: true })
+                            }
+                        })
+                }
+                catch (err) {
+                    client.log.error(err, true)
                     if (int.deferred) {
                         if (int.replied) {
                             return
@@ -48,9 +66,8 @@ module.exports = {
                     else {
                         return int.reply({ content: client.tl({ local: int.lang + "intCreate-onErr" }), ephemeral: true })
                     }
-                })
+                }
 
-                cmd.run(client, int)
                 client.emit("cmd", int, cmd.name)
                 const args = client.utils.argsString(int)
                 client.log.info(`Comando: ${cmd.name} executado por ${int.user.tag}(${int.user.id}) ${args ? `- Args: ${args}` : ``}`)