From ec0be7fb1eccfc0d7e9cf7bcbe17658c68d74491 Mon Sep 17 00:00:00 2001 From: Skillz Date: Thu, 19 Nov 2020 13:39:15 -0500 Subject: [PATCH] test fix for resume --- src/module/client.ts | 4 +++- src/module/shard.ts | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/module/client.ts b/src/module/client.ts index d2f44023a..aa677eb16 100644 --- a/src/module/client.ts +++ b/src/module/client.ts @@ -10,7 +10,7 @@ export let botID = ""; export let eventHandlers: EventHandlers = {}; export let botGatewayData: DiscordBotGatewayData; -export let proxyWSURL = ""; +export let proxyWSURL = "wss://gateway.discord.gg?v=8&encoding=json"; export const identifyPayload: IdentifyPayload = { token: "", @@ -45,6 +45,7 @@ export async function startBot(data: ClientOptions) { endpoints.GATEWAY_BOT, ) as DiscordBotGatewayData; + proxyWSURL = botGatewayData.url; identifyPayload.token = data.token; identifyPayload.intents = data.intents.reduce( (bits, next) => (bits |= next), @@ -93,6 +94,7 @@ export async function startBigBrainBot(data: BigBrainBotOptions) { endpoints.GATEWAY_BOT, ) as DiscordBotGatewayData; + if (!data.wsURL) proxyWSURL = botGatewayData.url spawnShards( botGatewayData, identifyPayload, diff --git a/src/module/shard.ts b/src/module/shard.ts index b6ce065cd..b2b6badbf 100644 --- a/src/module/shard.ts +++ b/src/module/shard.ts @@ -51,9 +51,7 @@ export async function createShard( const basicShard: BasicShard = { id: shardID, - socket: await connectWebSocket( - proxyWSURL || `${data.url}?v=8&encoding=json`, - ), + socket: await connectWebSocket(proxyWSURL), resumeInterval: 0, sessionID: oldShard?.sessionID || "", previousSequenceNumber: oldShard?.previousSequenceNumber || 0,