diff --git a/src/Discord.Net/API/DiscordSocketApiClient.cs b/src/Discord.Net/API/DiscordSocketApiClient.cs index 70d660cd4..f6040081e 100644 --- a/src/Discord.Net/API/DiscordSocketApiClient.cs +++ b/src/Discord.Net/API/DiscordSocketApiClient.cs @@ -179,7 +179,7 @@ namespace Discord.API { return await SendAsync("GET", "gateway", options: options).ConfigureAwait(false); } - public async Task SendIdentifyAsync(int largeThreshold = 100, bool useCompression = true, RequestOptions options = null) + public async Task SendIdentifyAsync(int largeThreshold = 100, bool useCompression = true, int shardID = 0, int totalShards = 1, RequestOptions options = null) { var props = new Dictionary { @@ -190,8 +190,10 @@ namespace Discord.API Token = _authToken, Properties = props, LargeThreshold = largeThreshold, - UseCompression = useCompression + UseCompression = useCompression, + ShardingParams = totalShards > 1 ? new int[] { shardID, totalShards } : null }; + await SendGatewayAsync(GatewayOpCode.Identify, msg, options: options).ConfigureAwait(false); } public async Task SendResumeAsync(string sessionId, int lastSeq, RequestOptions options = null) diff --git a/src/Discord.Net/API/Gateway/IdentifyParams.cs b/src/Discord.Net/API/Gateway/IdentifyParams.cs index 0a056e225..26e2952a1 100644 --- a/src/Discord.Net/API/Gateway/IdentifyParams.cs +++ b/src/Discord.Net/API/Gateway/IdentifyParams.cs @@ -14,5 +14,7 @@ namespace Discord.API.Gateway public int LargeThreshold { get; set; } [JsonProperty("compress")] public bool UseCompression { get; set; } + [JsonProperty("shard", NullValueHandling = NullValueHandling.Ignore)] + public int[] ShardingParams { get; set; } } } diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs index 3d485d7e5..72d48079f 100644 --- a/src/Discord.Net/DiscordSocketClient.cs +++ b/src/Discord.Net/DiscordSocketClient.cs @@ -166,7 +166,7 @@ namespace Discord if (_sessionId != null) await ApiClient.SendResumeAsync(_sessionId, _lastSeq).ConfigureAwait(false); else - await ApiClient.SendIdentifyAsync().ConfigureAwait(false); + await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards:TotalShards).ConfigureAwait(false); await _connectTask.Task.ConfigureAwait(false); _canReconnect = true; @@ -534,7 +534,7 @@ namespace Discord _sessionId = null; _lastSeq = 0; - await ApiClient.SendIdentifyAsync().ConfigureAwait(false); + await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards).ConfigureAwait(false); } break; case GatewayOpCode.Reconnect: