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

feature: Remove /users/@me call for socket and rework sharded client a bit (#1860)

Browse Source 
* Remove /users/@me call for socket and rework sharded client a bit

* Remove override for login
This commit is contained in:
Paulo
2021-05-28 18:40:39 -03:00
committed by GitHub
parent de7f9b5eff
commit 384ad85c64
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Discord.Net.WebSocket/DiscordShardedClient.cs
View File

@@ -40,7 +40,9 @@ namespace Discord.WebSocket
/// <summary>
/// Provides access to a REST-only client with a shared state from this client.
/// </summary>
public override DiscordSocketRestClient Rest => _shards[0].Rest;
public override DiscordSocketRestClient Rest => _shards?[0].Rest;
public override SocketSelfUser CurrentUser { get => _shards?.FirstOrDefault(x => x.CurrentUser != null)?.CurrentUser; protected set => throw new InvalidOperationException(); }
/// <summary> Creates a new REST/WebSocket Discord client. </summary>
public DiscordShardedClient() : this(null, new DiscordSocketConfig()) { }
@@ -330,14 +332,6 @@ namespace Discord.WebSocket
}
return Task.Delay(0);
};
if (isPrimary)
{
client.Ready += () =>
{
CurrentUser = client.CurrentUser;
return Task.Delay(0);
};
}
client.Connected += () => _shardConnectedEvent.InvokeAsync(client);
client.Disconnected += (exception) => _shardDisconnectedEvent.InvokeAsync(exception, client);