From 2c3468d56d520e81f2971cebb2c5ed7f74a1cf90 Mon Sep 17 00:00:00 2001
From: Shubham Parihar <shubhamparihar391@gmail.com>
Date: Sun, 6 Jun 2021 15:54:30 +0530
Subject: [PATCH 1/2] fix(*): add missing imports for custom errors

---
 src/managers/GuildApplicationCommandManager.js    | 1 +
 src/managers/GuildBanManager.js                   | 1 +
 src/sharding/ShardClientUtil.js                   | 1 +
 src/structures/Invite.js                          | 1 +
 src/structures/interfaces/InteractionResponses.js | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/managers/GuildApplicationCommandManager.js b/src/managers/GuildApplicationCommandManager.js
index e75ea5e9b50b..910cbfd7680d 100644
--- a/src/managers/GuildApplicationCommandManager.js
+++ b/src/managers/GuildApplicationCommandManager.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const ApplicationCommandManager = require('./ApplicationCommandManager');
+const { TypeError } = require('../errors');
 const Collection = require('../util/Collection');
 const { ApplicationCommandPermissionTypes } = require('../util/Constants');
 
diff --git a/src/managers/GuildBanManager.js b/src/managers/GuildBanManager.js
index cb2dd6d03712..a59772113344 100644
--- a/src/managers/GuildBanManager.js
+++ b/src/managers/GuildBanManager.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const BaseManager = require('./BaseManager');
+const { TypeError, Error } = require('../errors');
 const GuildBan = require('../structures/GuildBan');
 const GuildMember = require('../structures/GuildMember');
 const Collection = require('../util/Collection');
diff --git a/src/sharding/ShardClientUtil.js b/src/sharding/ShardClientUtil.js
index 044d8ab35818..abf27a84c8ea 100644
--- a/src/sharding/ShardClientUtil.js
+++ b/src/sharding/ShardClientUtil.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { Error } = require('../errors');
 const { Events } = require('../util/Constants');
 const Util = require('../util/Util');
 
diff --git a/src/structures/Invite.js b/src/structures/Invite.js
index 50a5660aafdd..924f88b44903 100644
--- a/src/structures/Invite.js
+++ b/src/structures/Invite.js
@@ -2,6 +2,7 @@
 
 const Base = require('./Base');
 const IntegrationApplication = require('./IntegrationApplication');
+const { Error } = require('../errors');
 const { Endpoints } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
 
diff --git a/src/structures/interfaces/InteractionResponses.js b/src/structures/interfaces/InteractionResponses.js
index 94086b6b6af5..9e487bb3776d 100644
--- a/src/structures/interfaces/InteractionResponses.js
+++ b/src/structures/interfaces/InteractionResponses.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { Error } = require('../../errors');
 const { InteractionResponseTypes } = require('../../util/Constants');
 const MessageFlags = require('../../util/MessageFlags');
 const APIMessage = require('../APIMessage');

From e497ef9b6d0a8592a2c63e07040f26411ef80399 Mon Sep 17 00:00:00 2001
From: Shubham Parihar <shubhamparihar391@gmail.com>
Date: Sun, 6 Jun 2021 17:54:13 +0530
Subject: [PATCH 2/2] fix(WebSocketManager): import custom Error without
 renaming it

---
 src/client/websocket/WebSocketManager.js | 6 +++---
 src/errors/Messages.js                   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js
index 7a07bc5b4540..2e54a3947007 100644
--- a/src/client/websocket/WebSocketManager.js
+++ b/src/client/websocket/WebSocketManager.js
@@ -3,7 +3,7 @@
 const EventEmitter = require('events');
 const WebSocketShard = require('./WebSocketShard');
 const PacketHandlers = require('./handlers');
-const { Error: DJSError } = require('../../errors');
+const { Error } = require('../../errors');
 const Collection = require('../../util/Collection');
 const { Events, ShardEvents, Status, WSCodes, WSEvents } = require('../../util/Constants');
 const Util = require('../../util/Util');
@@ -120,7 +120,7 @@ class WebSocketManager extends EventEmitter {
    * @private
    */
   async connect() {
-    const invalidToken = new DJSError(WSCodes[4004]);
+    const invalidToken = new Error(WSCodes[4004]);
     const {
       url: gatewayURL,
       shards: recommendedShards,
@@ -241,7 +241,7 @@ class WebSocketManager extends EventEmitter {
       await shard.connect();
     } catch (error) {
       if (error && error.code && UNRECOVERABLE_CLOSE_CODES.includes(error.code)) {
-        throw new DJSError(WSCodes[error.code]);
+        throw new Error(WSCodes[error.code]);
         // Undefined if session is invalid, error event for regular closes
       } else if (!error || error.code) {
         this.debug('Failed to connect to the gateway, requeueing...', shard);
diff --git a/src/errors/Messages.js b/src/errors/Messages.js
index f864d71eec9c..24a3b1af5b3d 100644
--- a/src/errors/Messages.js
+++ b/src/errors/Messages.js
@@ -14,6 +14,7 @@ const Messages = {
   WS_CLOSE_REQUESTED: 'WebSocket closed due to user request.',
   WS_CONNECTION_EXISTS: 'There is already an existing WebSocket connection.',
   WS_NOT_OPEN: (data = 'data') => `Websocket not open to send ${data}`,
+  MANAGER_DESTROYED: 'Manager was destroyed.',
 
   BITFIELD_INVALID: bit => `Invalid bitfield flag or number: ${bit}.`,