From d59d1d25e3c0b3a22df6e683066897e813d01b68 Mon Sep 17 00:00:00 2001 From: KubaZ2 Date: Wed, 28 Aug 2024 18:04:01 +0200 Subject: [PATCH] Normalize naming --- NetCord/Gateway/Voice/VoiceClient.cs | 4 ++-- NetCord/Gateway/WebSocketClient.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NetCord/Gateway/Voice/VoiceClient.cs b/NetCord/Gateway/Voice/VoiceClient.cs index e83ef847..1320c981 100644 --- a/NetCord/Gateway/Voice/VoiceClient.cs +++ b/NetCord/Gateway/Voice/VoiceClient.cs @@ -83,11 +83,11 @@ public async Task ResumeAsync(CancellationToken cancellationToken = default) private protected override bool Reconnect(WebSocketCloseStatus? status, string? description) => status is not ((WebSocketCloseStatus)4004 or (WebSocketCloseStatus)4006 or (WebSocketCloseStatus)4009 or (WebSocketCloseStatus)4014); - private protected override ValueTask TryResumeAsync(ConnectionState state, CancellationToken cancellationToken = default) + private protected override ValueTask TryResumeAsync(ConnectionState connectionState, CancellationToken cancellationToken = default) { var serializedPayload = new VoicePayloadProperties(VoiceOpcode.Resume, new(GuildId, SessionId, Token)).Serialize(Serialization.Default.VoicePayloadPropertiesVoiceResumeProperties); _latencyTimer.Start(); - return SendConnectionPayloadAsync(state, serializedPayload, _internalPayloadProperties, cancellationToken); + return SendConnectionPayloadAsync(connectionState, serializedPayload, _internalPayloadProperties, cancellationToken); } private protected override ValueTask HeartbeatAsync(ConnectionState connectionState, CancellationToken cancellationToken = default) diff --git a/NetCord/Gateway/WebSocketClient.cs b/NetCord/Gateway/WebSocketClient.cs index aa63c6df..3d07c889 100644 --- a/NetCord/Gateway/WebSocketClient.cs +++ b/NetCord/Gateway/WebSocketClient.cs @@ -636,11 +636,11 @@ private protected async ValueTask ReconnectAsync(State state) } } - private protected abstract ValueTask TryResumeAsync(ConnectionState state, CancellationToken cancellationToken = default); + private protected abstract ValueTask TryResumeAsync(ConnectionState connectionState, CancellationToken cancellationToken = default); - private protected async void StartHeartbeating(ConnectionState state, double interval) + private protected async void StartHeartbeating(ConnectionState connectionState, double interval) { - var cancellationToken = state.DisconnectedTokenProvider.Token; + var cancellationToken = connectionState.DisconnectedTokenProvider.Token; PeriodicTimer timer; @@ -661,7 +661,7 @@ private protected async void StartHeartbeating(ConnectionState state, double int try { await timer.WaitForNextTickAsync(cancellationToken).ConfigureAwait(false); - await HeartbeatAsync(state, cancellationToken).ConfigureAwait(false); + await HeartbeatAsync(connectionState, cancellationToken).ConfigureAwait(false); } catch {