From 8437156fd384f594e434b19b7ce217286f5780f3 Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Wed, 9 Jun 2021 20:10:39 +0200 Subject: [PATCH] :bug: fix identify struct --- package-lock.json | Bin 130286 -> 132610 bytes src/Server.ts | 2 +- src/opcodes/Identify.ts | 3 ++- src/schema/Identify.ts | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e57fa8520744bb85224521fe76678741956cc685..b429fe001df58f7416651d179e276b57dee0f2a8 100644 GIT binary patch delta 6441 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 delta 4510 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 diff --git a/src/Server.ts b/src/Server.ts index e897090c..f59ac7f1 100644 --- a/src/Server.ts +++ b/src/Server.ts @@ -34,7 +34,7 @@ export class Server { await this.setupSchema(); await Config.init(); console.log("[DB] connected"); - this.server.listen(this.port); + if (!this.server.listening) this.server.listen(this.port); console.log(`[Gateway] online on 0.0.0.0:${this.port}`); } diff --git a/src/opcodes/Identify.ts b/src/opcodes/Identify.ts index 1a136dd3..3b007766 100644 --- a/src/opcodes/Identify.ts +++ b/src/opcodes/Identify.ts @@ -16,7 +16,8 @@ import { import { setupListener } from "../listener/listener"; import { IdentifySchema } from "../schema/Identify"; import { Send } from "../util/Send"; -import experiments from "./experiments.json"; +// import experiments from "./experiments.json"; +const experiments: any = []; import { check } from "./instanceOf"; // TODO: bot sharding diff --git a/src/schema/Identify.ts b/src/schema/Identify.ts index eaa2ff80..646c5f05 100644 --- a/src/schema/Identify.ts +++ b/src/schema/Identify.ts @@ -39,6 +39,7 @@ export const IdentifySchema = { $read_state_version: Number, $user_guild_settings_version: Number, }, + $v: Number, }; export interface IdentifySchema { @@ -78,4 +79,5 @@ export interface IdentifySchema { read_state_version?: number; user_guild_settings_version?: number; }; + v?: number; }