From 22feedd5dc5819060c02f0a1ab47ae1b1a44362c Mon Sep 17 00:00:00 2001 From: spiral Date: Sat, 8 Jan 2022 09:08:09 -0500 Subject: [PATCH] Revert "feat: query identify ratelimiter when identifying instead of when connecting websocket" This reverts commit 5627fa98649cf824a5ad094920701eb93262cfa4. --- Myriad/Gateway/Shard.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Myriad/Gateway/Shard.cs b/Myriad/Gateway/Shard.cs index e6b172a1..b4804585 100644 --- a/Myriad/Gateway/Shard.cs +++ b/Myriad/Gateway/Shard.cs @@ -129,6 +129,8 @@ public class Shard { while (true) { + await _ratelimiter.Identify(_info.ShardId); + _logger.Information("Shard {ShardId}: Connecting to WebSocket", _info.ShardId); try { @@ -147,14 +149,7 @@ public class Shard => _conn.Disconnect(closeStatus, null); private async Task SendIdentify() - { - _logger.Debug("Shard {ShardId}: Requesting identify from ratelimiter", _info.ShardId); - - await _ratelimiter.Identify(_info.ShardId); - - _logger.Debug("Shard {ShardId}: Ratelimiter said OK to identify now", _info.ShardId); - - await _conn.Send(new GatewayPacket + => await _conn.Send(new GatewayPacket { Opcode = GatewayOpcode.Identify, Payload = new GatewayIdentify @@ -172,7 +167,6 @@ public class Shard LargeThreshold = 50 } }); - } private async Task SendResume((string SessionId, int? LastSeq) arg) => await _conn.Send(new GatewayPacket