github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Current user null on reconnect (#2092)

Browse Source
This commit is contained in:
Quin Lynch
2022-02-09 00:12:07 -04:00
committed by GitHub
parent 75e94feab0
commit b424bb2019
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Discord.Net.WebSocket/DiscordSocketClient.cs
View File

@@ -46,6 +46,7 @@ namespace Discord.WebSocket
private bool _isDisposed; private bool _isDisposed;
private GatewayIntents _gatewayIntents; private GatewayIntents _gatewayIntents;
private ImmutableArray<StickerPack<SocketSticker>> _defaultStickers; private ImmutableArray<StickerPack<SocketSticker>> _defaultStickers;
private SocketSelfUser _previousSessionUser;
/// <summary> /// <summary>
/// Provides access to a REST-only client with a shared state from this client. /// Provides access to a REST-only client with a shared state from this client.
@@ -888,6 +889,7 @@ namespace Discord.WebSocket
_sessionId = data.SessionId; _sessionId = data.SessionId;
_unavailableGuildCount = unavailableGuilds; _unavailableGuildCount = unavailableGuilds;
CurrentUser = currentUser; CurrentUser = currentUser;
_previousSessionUser = CurrentUser;
State = state; State = state;
} }
catch (Exception ex) catch (Exception ex)
@@ -930,6 +932,9 @@ namespace Discord.WebSocket
await GuildAvailableAsync(guild).ConfigureAwait(false); await GuildAvailableAsync(guild).ConfigureAwait(false);
} }
// Restore the previous sessions current user
CurrentUser = _previousSessionUser;
await _gatewayLogger.InfoAsync("Resumed previous session").ConfigureAwait(false); await _gatewayLogger.InfoAsync("Resumed previous session").ConfigureAwait(false);
} }
break; break;