From 77b33c18584b444edbb8c7d4edc682b8d75320a0 Mon Sep 17 00:00:00 2001
From: almeidx <almeidx@pm.me>
Date: Wed, 28 Jul 2021 16:43:31 +0100
Subject: [PATCH] renamed ErisError to DiscordJSError, use rateLimit event
 instead of debug, renamed the TOKEN variable back

---
 backend/src/{ErisError.ts => DiscordJSError.ts} |  4 ++--
 backend/src/index.ts                            | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)
 rename backend/src/{ErisError.ts => DiscordJSError.ts} (65%)

diff --git a/backend/src/ErisError.ts b/backend/src/DiscordJSError.ts
similarity index 65%
rename from backend/src/ErisError.ts
rename to backend/src/DiscordJSError.ts
index 732fa53b..26a3b8ed 100644
--- a/backend/src/ErisError.ts
+++ b/backend/src/DiscordJSError.ts
@@ -1,6 +1,6 @@
 import util from "util";
 
-export class ErisError extends Error {
+export class DiscordJSError extends Error {
   code: number | string | undefined;
   shardId: number;
 
@@ -11,6 +11,6 @@ export class ErisError extends Error {
   }
 
   [util.inspect.custom]() {
-    return `[ERIS] [ERROR CODE ${this.code || "?"}] [SHARD ${this.shardId}] ${this.message}`;
+    return `[DISCORDJS] [ERROR CODE ${this.code ?? "?"}] [SHARD ${this.shardId}] ${this.message}`;
   }
 }
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 163ba459..70bf4d2e 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -1,5 +1,4 @@
 import { Client, Intents, TextChannel } from "discord.js";
-import fs from "fs";
 import yaml from "js-yaml";
 import { Knub, PluginError } from "knub";
 import { PluginLoadError } from "knub/dist/plugins/PluginLoadError";
@@ -11,7 +10,7 @@ import { Configs } from "./data/Configs";
 import { connect } from "./data/db";
 import { GuildLogs } from "./data/GuildLogs";
 import { LogType } from "./data/LogType";
-import { ErisError } from "./ErisError";
+import { DiscordJSError } from "./DiscordJSError";
 import "./loadEnv";
 import { logger } from "./logger";
 import { baseGuildPlugins, globalPlugins, guildPlugins } from "./plugins/availablePlugins";
@@ -21,8 +20,6 @@ import { ZeppelinGlobalConfig, ZeppelinGuildConfig } from "./types";
 import { startUptimeCounter } from "./uptime";
 import { errorMessage, isDiscordAPIError, isDiscordHTTPError, successMessage } from "./utils";
 
-const fsp = fs.promises;
-
 if (!process.env.KEY) {
   // tslint:disable-next-line:no-console
   console.error("Project root .env with KEY is required!");
@@ -81,7 +78,7 @@ function errorHandler(err) {
     return;
   }
 
-  if (err instanceof ErisError) {
+  if (err instanceof DiscordJSError) {
     if (err.code && SAFE_TO_IGNORE_ERIS_ERROR_CODES.includes(err.code)) {
       return;
     }
@@ -176,14 +173,12 @@ connect().then(async () => {
   });
   client.setMaxListeners(200);
 
-  client.on("debug", message => {
-    if (message.includes(" 429 ")) {
-      logger.info(`[429] ${message}`);
-    }
+  client.on("rateLimit", rateLimitData => {
+    logger.info(`[429] ${rateLimitData}`);
   });
 
   client.on("error", err => {
-    errorHandler(new ErisError(err.message, (err as any).code, 0));
+    errorHandler(new DiscordJSError(err.message, (err as any).code, 0));
   });
 
   const allowedGuilds = new AllowedGuilds();
@@ -266,5 +261,5 @@ connect().then(async () => {
   bot.initialize();
   logger.info("Bot Initialized");
   logger.info("Logging in...");
-  await client.login(process.env.token);
+  await client.login(process.env.TOKEN);
 });