From c38072752656dc49044fa49f20aa6386be5fffc4 Mon Sep 17 00:00:00 2001
From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
Date: Tue, 2 Nov 2021 15:36:19 +0000
Subject: [PATCH] push latest so far

---
 src/bot.ts       |  1 -
 src/ws/resume.ts | 17 ++++++++---------
 tests/mod.ts     |  9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/bot.ts b/src/bot.ts
index 18aca89a7..cb379af35 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -415,7 +415,6 @@ export function createGatewayManager(
 }
 
 export async function stopBot(bot: Bot) {
-  // STOP REST
   // STOP WS
   bot.gateway.shards.forEach((shard) => {
     clearInterval(shard.heartbeat.intervalId);
diff --git a/src/ws/resume.ts b/src/ws/resume.ts
index 03c697d1d..d273f0bb2 100644
--- a/src/ws/resume.ts
+++ b/src/ws/resume.ts
@@ -7,19 +7,18 @@ export function resume(gateway: GatewayManager, shardId: number) {
   // NOW WE HANDLE RESUMING THIS SHARD
   // Get the old data for this shard necessary for resuming
   const oldShard = gateway.shards.get(shardId);
+  if (!oldShard) return gateway.debug(`[Error] Trying to resume a shard (id: ${shardId}) that was not first identified.`);
 
-  if (oldShard) {
-    // HOW TO CLOSE OLD SHARD SOCKET!!!
-    gateway.closeWS(oldShard.ws, 3064, "Resuming the shard, closing old shard.");
-    // STOP OLD HEARTBEAT
-    clearInterval(oldShard.heartbeat.intervalId);
-  }
+  // HOW TO CLOSE OLD SHARD SOCKET!!!
+  gateway.closeWS(oldShard.ws, 3064, "Resuming the shard, closing old shard.");
+  // STOP OLD HEARTBEAT
+  clearInterval(oldShard.heartbeat.intervalId);
 
   // CREATE A SHARD
   const socket = gateway.createShard(gateway, shardId);
 
-  const sessionId = oldShard?.sessionId || "";
-  const previousSequenceNumber = oldShard?.previousSequenceNumber || 0;
+  const sessionId = oldShard.sessionId || "";
+  const previousSequenceNumber = oldShard.previousSequenceNumber || 0;
 
   gateway.shards.set(shardId, {
     id: shardId,
@@ -38,7 +37,7 @@ export function resume(gateway: GatewayManager, shardId: number) {
       interval: 0,
       intervalId: 0,
     },
-    queue: oldShard?.queue || [],
+    queue: oldShard.queue || [],
     processingQueue: false,
     queueStartedAt: Date.now(),
     queueCounter: 0,
diff --git a/tests/mod.ts b/tests/mod.ts
index f31722839..1d887694c 100644
--- a/tests/mod.ts
+++ b/tests/mod.ts
@@ -619,13 +619,12 @@ Deno.test("[Bot] - Starting Tests", async (t) => {
   });
 
   // CONDUCT MEMORY BENCHMARK TESTS
-
-  t.step({
+  await t.step({
     name: "[Memory] Benchmark memory tests",
     fn: async (t) => {
       await memoryBenchmarks(bot, true);
     },
-    ...sanitizeMode,
-  }),
-    await stopBot(bot);
+  });
+
+  await stopBot(bot);
 });