From 864945f578992491fe828564f38ecd78b13cb8ac Mon Sep 17 00:00:00 2001
From: ITOH <72305210+itohatweb@users.noreply.github.com>
Date: Fri, 16 Apr 2021 18:57:42 +0200
Subject: [PATCH] remove identifyPayload

---
 src/bot.ts                           | 26 +++-----------------------
 src/helpers/members/fetch_members.ts |  4 ++--
 src/helpers/members/get_members.ts   |  5 +++--
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/bot.ts b/src/bot.ts
index 7d514ecfc..76026c9d1 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -14,18 +14,6 @@ export let eventHandlers: EventHandlers = {};
 
 export let proxyWSURL = `wss://gateway.discord.gg`;
 
-export const identifyPayload = {
-  token: "",
-  compress: true,
-  properties: {
-    $os: "linux",
-    $browser: "Discordeno",
-    $device: "Discordeno",
-  },
-  intents: 0,
-  shard: [0, 0],
-};
-
 export async function startBot(config: BotConfig) {
   if (config.eventHandlers) eventHandlers = config.eventHandlers;
   authorization = `Bot ${config.token}`;
@@ -49,17 +37,8 @@ export async function startBot(config: BotConfig) {
   ws.botGatewayData.url += `?v=${GATEWAY_VERSION}&encoding=json`;
 
   proxyWSURL = ws.botGatewayData.url;
-  identifyPayload.token = config.token;
-  identifyPayload.intents = config.intents.reduce(
-    (
-      bits,
-      next,
-    ) => (bits |= typeof next === "string"
-      ? DiscordGatewayIntents[next]
-      : next),
-    0,
-  );
-  identifyPayload.shard = [0, ws.botGatewayData.shards];
+
+  // ws.lastShardId = ws.maxShards;
 
   ws.spawnShards();
 }
@@ -122,6 +101,7 @@ export async function startBigBrainBot(config: BigBrainBotConfig) {
     console.log(ws.botGatewayData);
     ws.maxShards = ws.maxShards || config.lastShardId ||
       ws.botGatewayData.shards;
+    ws.lastShardId = config.lastShardId || ws.botGatewayData.shards;
     // Explicitly append gateway version and encoding
     ws.botGatewayData.url += `?v=${GATEWAY_VERSION}&encoding=json`;
     proxyWSURL = ws.botGatewayData.url;
diff --git a/src/helpers/members/fetch_members.ts b/src/helpers/members/fetch_members.ts
index e336d42cf..9a0428aad 100644
--- a/src/helpers/members/fetch_members.ts
+++ b/src/helpers/members/fetch_members.ts
@@ -1,9 +1,9 @@
-import { identifyPayload } from "../../bot.ts";
 import { DiscordenoMember } from "../../structures/member.ts";
 import { DiscordGatewayIntents } from "../../types/gateway/gateway_intents.ts";
 import { RequestGuildMembers } from "../../types/guilds/request_guild_members.ts";
 import { Errors } from "../../types/misc/errors.ts";
 import { Collection } from "../../util/collection.ts";
+import { ws } from "../../ws/ws.ts";
 
 /**
  * ⚠️ BEGINNER DEVS!! YOU SHOULD ALMOST NEVER NEED THIS AND YOU CAN GET FROM cache.members.get()
@@ -21,7 +21,7 @@ export function fetchMembers(
   // You can request 1 member without the intent
   if (
     (!options?.limit || options.limit > 1) &&
-    !(identifyPayload.intents && DiscordGatewayIntents.GUILD_MEMBERS)
+    !(ws.identifyPayload.intents && DiscordGatewayIntents.GUILD_MEMBERS)
   ) {
     throw new Error(Errors.MISSING_INTENT_GUILD_MEMBERS);
   }
diff --git a/src/helpers/members/get_members.ts b/src/helpers/members/get_members.ts
index 396eb844f..0a1a97249 100644
--- a/src/helpers/members/get_members.ts
+++ b/src/helpers/members/get_members.ts
@@ -1,4 +1,4 @@
-import { eventHandlers, identifyPayload } from "../../bot.ts";
+import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { DiscordenoMember } from "../../structures/member.ts";
@@ -12,6 +12,7 @@ import { ListGuildMembers } from "../../types/guilds/list_guild_members.ts";
 import { Errors } from "../../types/misc/errors.ts";
 import { Collection } from "../../util/collection.ts";
 import { endpoints } from "../../util/constants.ts";
+import { ws } from "../../ws/ws.ts";
 
 /**
  * ⚠️ BEGINNER DEVS!! YOU SHOULD ALMOST NEVER NEED THIS AND YOU CAN GET FROM cache.members.get()
@@ -22,7 +23,7 @@ import { endpoints } from "../../util/constants.ts";
  * GW(fetchMembers): 120/m(PER shard) rate limit. Meaning if you have 8 shards your limit is 960/m.
  */
 export async function getMembers(guildId: string, options?: ListGuildMembers) {
-  if (!(identifyPayload.intents && DiscordGatewayIntents.GUILD_MEMBERS)) {
+  if (!(ws.identifyPayload.intents && DiscordGatewayIntents.GUILD_MEMBERS)) {
     throw new Error(Errors.MISSING_INTENT_GUILD_MEMBERS);
   }