From fa61e65d3460c4d302182ed4295cb115bd153323 Mon Sep 17 00:00:00 2001 From: NycroV <83246959+NycroV@users.noreply.github.com> Date: Tue, 13 Aug 2024 06:57:05 -0400 Subject: [PATCH 1/4] Update for latest nightly --- .../DSharpPlusUtilities.cs | 93 ------------------- .../DiscordClientWrapper.cs | 60 ++++++------ .../Lavalink4NET.DSharpPlus.Nightly.csproj | 3 +- .../Lavalink4NETInvokeHandlers.cs | 26 ++++++ .../ServiceCollectionExtensions.cs | 7 +- 5 files changed, 67 insertions(+), 122 deletions(-) delete mode 100644 src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs create mode 100644 src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NETInvokeHandlers.cs diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs deleted file mode 100644 index d4085169..00000000 --- a/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs +++ /dev/null @@ -1,93 +0,0 @@ -namespace Lavalink4NET.DSharpPlus; - -using System; -using System.Collections.Concurrent; -using System.Reflection; -using global::DSharpPlus; -using global::DSharpPlus.Clients; -using global::DSharpPlus.AsyncEvents; -using System.Threading.Tasks; - -/// -/// An utility for getting internal / private fields from DSharpPlus WebSocket Gateway Payloads. -/// -public static partial class DSharpPlusUtilities -{ - /// - /// The internal "events" property info in . - /// - // https://github.com/DSharpPlus/DSharpPlus/blob/master/DSharpPlus/Clients/DiscordClient.cs#L37 - private static readonly FieldInfo eventsField = - typeof(DiscordClient).GetField("events", BindingFlags.NonPublic | BindingFlags.Instance)!; - - /// - /// Gets the internal "events" property value of the specified . - /// - /// the instance - /// the "events" value - public static ConcurrentDictionary GetEvents(this DiscordClient client) - => (ConcurrentDictionary)eventsField.GetValue(client)!; - - /// - /// The internal "errorHandler" property info in . - /// - // https://github.com/DSharpPlus/DSharpPlus/blob/master/DSharpPlus/Clients/DiscordClient.cs#L41 - private static readonly FieldInfo errorHandlerField = - typeof(DiscordClient).GetField("errorHandler", BindingFlags.NonPublic | BindingFlags.Instance)!; - - /// - /// Gets the internal "errorHandler" property value of the specified . - /// - /// the instance - /// the "errorHandler" value - public static IClientErrorHandler GetErrorHandler(this DiscordClient client) - => (IClientErrorHandler)errorHandlerField.GetValue(client)!; - - /// - /// The internal "Register" method info in . - /// - // https://github.com/DSharpPlus/DSharpPlus/blob/master/DSharpPlus/AsyncEvents/AsyncEvent.cs#L14 - private static readonly MethodInfo asyncEventRegisterMethod = - typeof(AsyncEvent).GetMethod("Register", BindingFlags.NonPublic | BindingFlags.Instance, [typeof(Delegate)])!; - - /// - /// Calls the internal "Register" method of the spedificed - /// - /// the instance - /// the event to register - public static void Register(this AsyncEvent asyncEvent, Delegate @delegate) => asyncEventRegisterMethod.Invoke(asyncEvent, [@delegate]); - - /// - /// The internal "orchestrator" property info in . - /// - // https://github.com/DSharpPlus/DSharpPlus/blob/master/DSharpPlus/Clients/DiscordClient.cs#L47 - private static readonly FieldInfo orchestratorField = - typeof(DiscordClient).GetField("orchestrator", BindingFlags.NonPublic | BindingFlags.Instance)!; - - /// - /// The internal "shardCount" property info in . - /// - // https://github.com/DSharpPlus/DSharpPlus/blob/master/DSharpPlus/Clients/DiscordClient.cs#L47 - private static readonly FieldInfo shardCountField = - typeof(MultiShardOrchestrator).GetField("shardCount", BindingFlags.NonPublic | BindingFlags.Instance)!; - - /// - /// Gets the number of connected shards or this client - /// - public static async ValueTask GetShardCountAsync(this DiscordClient client) - { - var orchestrator = (IShardOrchestrator)orchestratorField.GetValue(client)!; - - if (orchestrator is SingleShardOrchestrator) - return 1; - - if (orchestrator is MultiShardOrchestrator multiShardOrchestrator) - return (int)(uint)shardCountField.GetValue(multiShardOrchestrator)!; - - // If the orchestrator is neither a Single nor Multi sharded orchestrator, that means it - // is using a custom solution implemented by the end user. There is no way to directly access - // the shard count in this case, so instead we estimate it by using Discord's recommended - // shard amount. - return (await client.GetGatewayInfoAsync()).ShardCount; - } -} diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs index 767f8393..23b2051d 100644 --- a/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs +++ b/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs @@ -5,16 +5,16 @@ namespace Lavalink4NET.DSharpPlus; using System.Threading; using System.Threading.Tasks; using global::DSharpPlus; -using global::DSharpPlus.AsyncEvents; +using global::DSharpPlus.Clients; using global::DSharpPlus.Entities; using global::DSharpPlus.EventArgs; using global::DSharpPlus.Exceptions; using global::DSharpPlus.Net.Abstractions; using Lavalink4NET.Clients; -using L4N = Clients.Events; +using Lavalink4NET = Clients.Events; using Lavalink4NET.Events; using Microsoft.Extensions.Logging; -using System.Collections.Concurrent; +using System.Reflection; /// /// Wraps a instance. @@ -22,15 +22,21 @@ namespace Lavalink4NET.DSharpPlus; public sealed class DiscordClientWrapper : IDiscordClientWrapper { /// - public event AsyncEventHandler? VoiceServerUpdated; + public event AsyncEventHandler? VoiceServerUpdated; /// - public event AsyncEventHandler? VoiceStateUpdated; + public event AsyncEventHandler? VoiceStateUpdated; - private readonly DiscordClient _client; // sharded clients are now also managed by the same DiscordClient type + private readonly DiscordClient _client; private readonly ILogger _logger; private readonly TaskCompletionSource _readyTaskCompletionSource; + /// + /// Re-assign this delegate in the client configuration to change the way the connected shard count is retrived.
+ /// You will only need to do this if you are using a custom IShardOrchestrator for your client. + /// + public Func> GetShardCount { get; set; } + /// /// Creates a new instance of . /// @@ -43,27 +49,26 @@ public DiscordClientWrapper(DiscordClient discordClient, ILogger(TaskCreationOptions.RunContinuationsAsynchronously); - void AddEventHandler(Type eventArgsType, Delegate eventHandler) - { - IClientErrorHandler errorHandler = discordClient.GetErrorHandler(); - ConcurrentDictionary events = discordClient.GetEvents(); + FieldInfo orchestratorField = typeof(DiscordClient).GetField("orchestrator", BindingFlags.NonPublic | BindingFlags.Instance)!; + var orchestrator = (IShardOrchestrator)orchestratorField.GetValue(discordClient)!; - Type asyncEventType = typeof(AsyncEvent<,>).MakeGenericType(discordClient.GetType(), eventArgsType); - AsyncEvent asyncEvent = events.GetOrAdd(eventArgsType, _ => (AsyncEvent)Activator.CreateInstance - ( - type: asyncEventType, - args: [errorHandler] - )!); + if (orchestrator is SingleShardOrchestrator) + GetShardCount = () => Task.FromResult(1); - asyncEvent.Register(eventHandler); + else if (orchestrator is MultiShardOrchestrator multiShardOrchestrator) + { + FieldInfo shardCountField = typeof(MultiShardOrchestrator).GetField("shardCount", BindingFlags.NonPublic | BindingFlags.Instance)!; + GetShardCount = () => Task.Run(() => (int)(uint)shardCountField.GetValue(multiShardOrchestrator)!); } - AddEventHandler(typeof(VoiceStateUpdatedEventArgs), new AsyncEventHandler(OnVoiceStateUpdated)); - AddEventHandler(typeof(VoiceServerUpdatedEventArgs), new AsyncEventHandler(OnVoiceServerUpdated)); - AddEventHandler(typeof(GuildDownloadCompletedEventArgs), new AsyncEventHandler(OnGuildDownloadCompleted)); + else + { + GetShardCount = () => Task.Run(async () => (await discordClient.GetGatewayInfoAsync()).ShardCount); + _logger.LogInformation("The DiscordClient is configured to use a non-default Shard Orchestrator - " + + "make sure that this wrapper's GetShardCount property is configured to properly retrieve the shard count"); + } } /// @@ -88,6 +93,7 @@ public async ValueTask> GetChannelUsersAsync( return ImmutableArray.Empty; } } + catch (DiscordException exception) { _logger.LogWarning( @@ -152,7 +158,7 @@ public ValueTask WaitForReadyAsync(CancellationToken cancella return new(_readyTaskCompletionSource.Task.WaitAsync(cancellationToken)); } - private async Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDownloadCompletedEventArgs eventArgs) + internal async Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDownloadCompletedEventArgs eventArgs) { ArgumentNullException.ThrowIfNull(discordClient); ArgumentNullException.ThrowIfNull(eventArgs); @@ -160,12 +166,12 @@ private async Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDo var clientInformation = new ClientInformation( Label: "DSharpPlus", CurrentUserId: discordClient.CurrentUser.Id, - ShardCount: await discordClient.GetShardCountAsync()); + ShardCount: await GetShardCount()); _readyTaskCompletionSource.TrySetResult(clientInformation); } - private async Task OnVoiceServerUpdated(DiscordClient discordClient, VoiceServerUpdatedEventArgs voiceServerUpdateEventArgs) + internal async Task OnVoiceServerUpdated(DiscordClient discordClient, VoiceServerUpdatedEventArgs voiceServerUpdateEventArgs) { ArgumentNullException.ThrowIfNull(discordClient); ArgumentNullException.ThrowIfNull(voiceServerUpdateEventArgs); @@ -174,7 +180,7 @@ private async Task OnVoiceServerUpdated(DiscordClient discordClient, VoiceServer Token: voiceServerUpdateEventArgs.VoiceToken, Endpoint: voiceServerUpdateEventArgs.Endpoint); - var eventArgs = new L4N.VoiceServerUpdatedEventArgs( + var eventArgs = new Lavalink4NET.VoiceServerUpdatedEventArgs( guildId: voiceServerUpdateEventArgs.Guild.Id, voiceServer: server); @@ -183,7 +189,7 @@ await VoiceServerUpdated .ConfigureAwait(false); } - private async Task OnVoiceStateUpdated(DiscordClient discordClient, VoiceStateUpdatedEventArgs voiceStateUpdateEventArgs) + internal async Task OnVoiceStateUpdated(DiscordClient discordClient, VoiceStateUpdatedEventArgs voiceStateUpdateEventArgs) { ArgumentNullException.ThrowIfNull(discordClient); ArgumentNullException.ThrowIfNull(voiceStateUpdateEventArgs); @@ -202,7 +208,7 @@ private async Task OnVoiceStateUpdated(DiscordClient discordClient, VoiceStateUp SessionId: sessionId); // invoke event - var eventArgs = new L4N.VoiceStateUpdatedEventArgs( + var eventArgs = new Lavalink4NET.VoiceStateUpdatedEventArgs( guildId: voiceStateUpdateEventArgs.Guild.Id, userId: voiceStateUpdateEventArgs.User.Id, isCurrentUser: voiceStateUpdateEventArgs.User.Id == discordClient.CurrentUser.Id, diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj b/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj index 80045932..e4ee51cd 100644 --- a/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj +++ b/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj @@ -9,9 +9,10 @@ true False + 1.0.4 - + diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NETInvokeHandlers.cs b/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NETInvokeHandlers.cs new file mode 100644 index 00000000..c1c24838 --- /dev/null +++ b/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NETInvokeHandlers.cs @@ -0,0 +1,26 @@ +namespace Lavalink4NET.DSharpPlus; + +using System.Threading.Tasks; +using global::DSharpPlus; +using global::DSharpPlus.EventArgs; +using Lavalink4NET.Clients; + +/// +/// Forwards event triggers to the Lavalink4NET client wrapper +/// +internal sealed class Lavalink4NETInvokeHandlers(IDiscordClientWrapper wrapper) : + IEventHandler, + IEventHandler, + IEventHandler +{ + private readonly DiscordClientWrapper wrapper = (DiscordClientWrapper)wrapper; + + public async Task HandleEventAsync(DiscordClient sender, GuildDownloadCompletedEventArgs eventArgs) + => await wrapper.OnGuildDownloadCompleted(sender, eventArgs); + + public async Task HandleEventAsync(DiscordClient sender, VoiceServerUpdatedEventArgs eventArgs) + => await wrapper.OnVoiceServerUpdated(sender, eventArgs); + + public async Task HandleEventAsync(DiscordClient sender, VoiceStateUpdatedEventArgs eventArgs) + => await wrapper.OnVoiceStateUpdated(sender, eventArgs); +} diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/ServiceCollectionExtensions.cs b/src/Lavalink4NET.DSharpPlus.Nightly/ServiceCollectionExtensions.cs index f127068f..392827c9 100644 --- a/src/Lavalink4NET.DSharpPlus.Nightly/ServiceCollectionExtensions.cs +++ b/src/Lavalink4NET.DSharpPlus.Nightly/ServiceCollectionExtensions.cs @@ -1,6 +1,7 @@ namespace Lavalink4NET.Extensions; using System; +using global::DSharpPlus.Extensions; using Lavalink4NET.DSharpPlus; using Microsoft.Extensions.DependencyInjection; @@ -17,6 +18,10 @@ public static class ServiceCollectionExtensions public static IServiceCollection AddLavalink(this IServiceCollection services) { ArgumentNullException.ThrowIfNull(services); - return services.AddLavalink(); + + services.AddLavalink(); + services.ConfigureEventHandlers(events => events.AddEventHandlers(ServiceLifetime.Transient)); + + return services; } } From b52e265e767d4d32eb5d2bb1bbc34d3ee6daeea0 Mon Sep 17 00:00:00 2001 From: NycroV <83246959+NycroV@users.noreply.github.com> Date: Tue, 13 Aug 2024 08:06:39 -0400 Subject: [PATCH 2/4] Prepare for incoming DSharpPlus IShardOrchestrator changes --- .../DSharpPlusUtilities.cs | 35 +++++++++++++++++++ .../DiscordClientWrapper.cs | 30 ++-------------- 2 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs new file mode 100644 index 00000000..afbfea71 --- /dev/null +++ b/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs @@ -0,0 +1,35 @@ +namespace Lavalink4NET.DSharpPlus; + +using System.Reflection; +using global::DSharpPlus; +using global::DSharpPlus.Clients; + +/// +/// An utility for getting internal / private fields from DSharpPlus WebSocket Gateway Payloads. +/// +public static partial class DSharpPlusUtilities +{ + /// + /// The internal "orchestrator" property info in . + /// + private static readonly FieldInfo orchestratorField = + typeof(DiscordClient).GetField("orchestrator", BindingFlags.NonPublic | BindingFlags.Instance)!; + + /// + /// Gets the amount of shards handled by this client's orchestrator. + /// + public static int GetConnectedShardCount(this DiscordClient client) + { + var orchestrator = (IShardOrchestrator)orchestratorField.GetValue(client)!; + return orchestrator.ConnectedShardCount; + } + + /// + /// Gets the total amount of shards connected to this bot. + /// + public static int GetTotalShardCount(this DiscordClient client) + { + var orchestrator = (IShardOrchestrator)orchestratorField.GetValue(client)!; + return orchestrator.TotalShardCount; + } +} diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs index 23b2051d..dd095220 100644 --- a/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs +++ b/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs @@ -31,12 +31,6 @@ public sealed class DiscordClientWrapper : IDiscordClientWrapper private readonly ILogger _logger; private readonly TaskCompletionSource _readyTaskCompletionSource; - /// - /// Re-assign this delegate in the client configuration to change the way the connected shard count is retrived.
- /// You will only need to do this if you are using a custom IShardOrchestrator for your client. - /// - public Func> GetShardCount { get; set; } - /// /// Creates a new instance of . /// @@ -50,25 +44,6 @@ public DiscordClientWrapper(DiscordClient discordClient, ILogger(TaskCreationOptions.RunContinuationsAsynchronously); - - FieldInfo orchestratorField = typeof(DiscordClient).GetField("orchestrator", BindingFlags.NonPublic | BindingFlags.Instance)!; - var orchestrator = (IShardOrchestrator)orchestratorField.GetValue(discordClient)!; - - if (orchestrator is SingleShardOrchestrator) - GetShardCount = () => Task.FromResult(1); - - else if (orchestrator is MultiShardOrchestrator multiShardOrchestrator) - { - FieldInfo shardCountField = typeof(MultiShardOrchestrator).GetField("shardCount", BindingFlags.NonPublic | BindingFlags.Instance)!; - GetShardCount = () => Task.Run(() => (int)(uint)shardCountField.GetValue(multiShardOrchestrator)!); - } - - else - { - GetShardCount = () => Task.Run(async () => (await discordClient.GetGatewayInfoAsync()).ShardCount); - _logger.LogInformation("The DiscordClient is configured to use a non-default Shard Orchestrator - " + - "make sure that this wrapper's GetShardCount property is configured to properly retrieve the shard count"); - } } /// @@ -158,7 +133,7 @@ public ValueTask WaitForReadyAsync(CancellationToken cancella return new(_readyTaskCompletionSource.Task.WaitAsync(cancellationToken)); } - internal async Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDownloadCompletedEventArgs eventArgs) + internal Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDownloadCompletedEventArgs eventArgs) { ArgumentNullException.ThrowIfNull(discordClient); ArgumentNullException.ThrowIfNull(eventArgs); @@ -166,9 +141,10 @@ internal async Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildD var clientInformation = new ClientInformation( Label: "DSharpPlus", CurrentUserId: discordClient.CurrentUser.Id, - ShardCount: await GetShardCount()); + ShardCount: discordClient.GetConnectedShardCount()); _readyTaskCompletionSource.TrySetResult(clientInformation); + return Task.CompletedTask; } internal async Task OnVoiceServerUpdated(DiscordClient discordClient, VoiceServerUpdatedEventArgs voiceServerUpdateEventArgs) From 9f4abb0a1d7d595ae8269f9cfe7a105440f55d36 Mon Sep 17 00:00:00 2001 From: NycroV <83246959+NycroV@users.noreply.github.com> Date: Tue, 13 Aug 2024 08:57:56 -0400 Subject: [PATCH 3/4] Change out reflection for dependency injection --- .../DSharpPlusUtilities.cs | 35 ------------------- .../DiscordClientWrapper.cs | 11 +++--- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs deleted file mode 100644 index afbfea71..00000000 --- a/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace Lavalink4NET.DSharpPlus; - -using System.Reflection; -using global::DSharpPlus; -using global::DSharpPlus.Clients; - -/// -/// An utility for getting internal / private fields from DSharpPlus WebSocket Gateway Payloads. -/// -public static partial class DSharpPlusUtilities -{ - /// - /// The internal "orchestrator" property info in . - /// - private static readonly FieldInfo orchestratorField = - typeof(DiscordClient).GetField("orchestrator", BindingFlags.NonPublic | BindingFlags.Instance)!; - - /// - /// Gets the amount of shards handled by this client's orchestrator. - /// - public static int GetConnectedShardCount(this DiscordClient client) - { - var orchestrator = (IShardOrchestrator)orchestratorField.GetValue(client)!; - return orchestrator.ConnectedShardCount; - } - - /// - /// Gets the total amount of shards connected to this bot. - /// - public static int GetTotalShardCount(this DiscordClient client) - { - var orchestrator = (IShardOrchestrator)orchestratorField.GetValue(client)!; - return orchestrator.TotalShardCount; - } -} diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs index dd095220..60a9fb7d 100644 --- a/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs +++ b/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs @@ -14,7 +14,6 @@ namespace Lavalink4NET.DSharpPlus; using Lavalink4NET = Clients.Events; using Lavalink4NET.Events; using Microsoft.Extensions.Logging; -using System.Reflection; /// /// Wraps a instance. @@ -28,6 +27,7 @@ public sealed class DiscordClientWrapper : IDiscordClientWrapper public event AsyncEventHandler? VoiceStateUpdated; private readonly DiscordClient _client; + private readonly IShardOrchestrator _shardOrchestrator; private readonly ILogger _logger; private readonly TaskCompletionSource _readyTaskCompletionSource; @@ -35,13 +35,16 @@ public sealed class DiscordClientWrapper : IDiscordClientWrapper /// Creates a new instance of . /// /// The Discord Client to wrap. - /// a logger associated with this wrapper. - public DiscordClientWrapper(DiscordClient discordClient, ILogger logger) + /// The Discord shard orchestrator associated with this client. + /// A logger associated with this wrapper. + public DiscordClientWrapper(DiscordClient discordClient, IShardOrchestrator shardOrchestrator, ILogger logger) { ArgumentNullException.ThrowIfNull(discordClient); + ArgumentNullException.ThrowIfNull(shardOrchestrator); ArgumentNullException.ThrowIfNull(logger); _client = discordClient; + _shardOrchestrator = shardOrchestrator; _logger = logger; _readyTaskCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); } @@ -141,7 +144,7 @@ internal Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDownloa var clientInformation = new ClientInformation( Label: "DSharpPlus", CurrentUserId: discordClient.CurrentUser.Id, - ShardCount: discordClient.GetConnectedShardCount()); + ShardCount: _shardOrchestrator.ConnectedShardCount); _readyTaskCompletionSource.TrySetResult(clientInformation); return Task.CompletedTask; From 1467e7ef1a72bfb2281313460b948e30479ef256 Mon Sep 17 00:00:00 2001 From: NycroV <83246959+NycroV@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:20:29 -0400 Subject: [PATCH 4/4] Update .csproj for latest DSharpPlus nightly build --- .../Lavalink4NET.DSharpPlus.Nightly.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj b/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj index e4ee51cd..4c213398 100644 --- a/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj +++ b/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NET.DSharpPlus.Nightly.csproj @@ -12,7 +12,7 @@ 1.0.4 - +