From 73d188c5dc581cb6fdc3374b55863a412b81f3e9 Mon Sep 17 00:00:00 2001
From: DJj123dj <80536295+DJj123dj@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:28:32 +0100
Subject: [PATCH] Fixed #129 : Improved invalid token error

---
 src/core/api/modules/client.ts | 6 ++++--
 src/index.ts                   | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/core/api/modules/client.ts b/src/core/api/modules/client.ts
index 393b9dd..1633032 100644
--- a/src/core/api/modules/client.ts
+++ b/src/core/api/modules/client.ts
@@ -147,9 +147,11 @@ export class ODClientManager {
                 this.#debug.debug("Finished discord.js client.login()")
                 this.loggedIn = true
             }catch(err){
-                if (err.message.toLowerCase() == "used disallowed intents"){
+                if (err.message.toLowerCase().includes("used disallowed intents")){
                     process.emit("uncaughtException",new ODSystemError("Used disallowed intents"))
-                }else reject("login error: "+err)
+                }else if (err.message.toLowerCase().includes("tokeninvalid") || err.message.toLowerCase().includes("an invalid token was provided")){
+                    process.emit("uncaughtException",new ODSystemError("Invalid discord bot token provided"))
+                }else reject("OT Login Error: "+err)
             }
         })
     }
diff --git a/src/index.ts b/src/index.ts
index e356ba9..3da07f8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -49,16 +49,16 @@ const main = async () => {
             await openticket.events.get("onErrorHandling").emit([error,origin])
             if (openticket.defaults.getDefault("errorHandling")){
                 //custom error messages for known errors
-                if (error.message == "Used disallowed intents"){
+                if (error.message.toLowerCase().includes("used disallowed intents")){
                     //invalid intents
                     openticket.log("Open Ticket doesn't work without Privileged Gateway Intents enabled!","error")
                     openticket.log("Enable them in the discord developer portal!","info")
                     console.log("\n")
                     process.exit(1)
-                }else if (error.message == "An invalid token was provided."){
+                }else if (error.message.toLowerCase().includes("invalid discord bot token provided")){
                     //invalid token
                     openticket.log("An invalid discord auth token was provided!","error")
-                    openticket.log("Check the config if you have copied the token correctly!","info")
+                    openticket.log("Check the config if you have inserted the bot token correctly!","info")
                     console.log("\n")
                     process.exit(1)
                 }else{
@@ -453,7 +453,7 @@ const main = async () => {
         await openticket.events.get("afterClientInitiated").emit([openticket.client])
 
         //client login
-        await openticket.client.login()
+        await openticket.client.login().catch((reason) => process.emit("uncaughtException",new api.ODSystemError(reason)))
         openticket.log("discord.js client ready!","info")
     }