Merge pull request #167 from NycroV/dev

Update code for latest nightly builds
angelobreuer · Aug 14, 2024 · f5dc4f6 · f5dc4f6
2 parents 13819c4 + 1467e7e
commit f5dc4f6
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 129 deletions.
diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DSharpPlusUtilities.cs
diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs b/src/Lavalink4NET.DSharpPlus.Nightly/DiscordClientWrapper.cs
@@ -5,65 +5,48 @@ 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;
 
 /// <summary>
 /// Wraps a <see cref="DiscordClient"/> instance.
 /// </summary>
 public sealed class DiscordClientWrapper : IDiscordClientWrapper
 {
     /// <inheritdoc/>
-    public event AsyncEventHandler<L4N.VoiceServerUpdatedEventArgs>? VoiceServerUpdated;
+    public event AsyncEventHandler<Lavalink4NET.VoiceServerUpdatedEventArgs>? VoiceServerUpdated;
 
     /// <inheritdoc/>
-    public event AsyncEventHandler<L4N.VoiceStateUpdatedEventArgs>? VoiceStateUpdated;
+    public event AsyncEventHandler<Lavalink4NET.VoiceStateUpdatedEventArgs>? VoiceStateUpdated;
 
-    private readonly DiscordClient _client; // sharded clients are now also managed by the same DiscordClient type
+    private readonly DiscordClient _client;
+    private readonly IShardOrchestrator _shardOrchestrator;
     private readonly ILogger<DiscordClientWrapper> _logger;
     private readonly TaskCompletionSource<ClientInformation> _readyTaskCompletionSource;
 
     /// <summary>
     /// Creates a new instance of <see cref="DiscordClientWrapper"/>.
     /// </summary>
     /// <param name="discordClient">The Discord Client to wrap.</param>
-    /// <param name="logger">a logger associated with this wrapper.</param>
-    public DiscordClientWrapper(DiscordClient discordClient, ILogger<DiscordClientWrapper> logger)
+    /// <param name="shardOrchestrator">The Discord shard orchestrator associated with this client.</param>
+    /// <param name="logger">A logger associated with this wrapper.</param>
+    public DiscordClientWrapper(DiscordClient discordClient, IShardOrchestrator shardOrchestrator, ILogger<DiscordClientWrapper> logger)
     {
         ArgumentNullException.ThrowIfNull(discordClient);
+        ArgumentNullException.ThrowIfNull(shardOrchestrator);
         ArgumentNullException.ThrowIfNull(logger);
 
         _client = discordClient;
+        _shardOrchestrator = shardOrchestrator;
         _logger = logger;
-
         _readyTaskCompletionSource = new TaskCompletionSource<ClientInformation>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-        void AddEventHandler(Type eventArgsType, Delegate eventHandler)
-        {
-            IClientErrorHandler errorHandler = discordClient.GetErrorHandler();
-            ConcurrentDictionary<Type, AsyncEvent> events = discordClient.GetEvents();
-
-            Type asyncEventType = typeof(AsyncEvent<,>).MakeGenericType(discordClient.GetType(), eventArgsType);
-            AsyncEvent asyncEvent = events.GetOrAdd(eventArgsType, _ => (AsyncEvent)Activator.CreateInstance
-            (
-                type: asyncEventType,
-                args: [errorHandler]
-            )!);
-
-            asyncEvent.Register(eventHandler);
-        }
-
-        AddEventHandler(typeof(VoiceStateUpdatedEventArgs), new AsyncEventHandler<DiscordClient, VoiceStateUpdatedEventArgs>(OnVoiceStateUpdated));
-        AddEventHandler(typeof(VoiceServerUpdatedEventArgs), new AsyncEventHandler<DiscordClient, VoiceServerUpdatedEventArgs>(OnVoiceServerUpdated));
-        AddEventHandler(typeof(GuildDownloadCompletedEventArgs), new AsyncEventHandler<DiscordClient, GuildDownloadCompletedEventArgs>(OnGuildDownloadCompleted));
     }
 
     /// <inheritdoc/>
@@ -88,6 +71,7 @@ public async ValueTask<ImmutableArray<ulong>> GetChannelUsersAsync(
                 return ImmutableArray<ulong>.Empty;
             }
         }
+
         catch (DiscordException exception)
         {
             _logger.LogWarning(
@@ -152,20 +136,21 @@ public ValueTask<ClientInformation> WaitForReadyAsync(CancellationToken cancella
         return new(_readyTaskCompletionSource.Task.WaitAsync(cancellationToken));
     }
 
-    private async Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDownloadCompletedEventArgs eventArgs)
+    internal Task OnGuildDownloadCompleted(DiscordClient discordClient, GuildDownloadCompletedEventArgs eventArgs) 
     {
         ArgumentNullException.ThrowIfNull(discordClient);
         ArgumentNullException.ThrowIfNull(eventArgs);
 
         var clientInformation = new ClientInformation(
             Label: "DSharpPlus",
             CurrentUserId: discordClient.CurrentUser.Id,
-            ShardCount: await discordClient.GetShardCountAsync());
+            ShardCount: _shardOrchestrator.ConnectedShardCount);
 
         _readyTaskCompletionSource.TrySetResult(clientInformation);
+        return Task.CompletedTask;
     }
 
-    private async Task OnVoiceServerUpdated(DiscordClient discordClient, VoiceServerUpdatedEventArgs voiceServerUpdateEventArgs)
+    internal async Task OnVoiceServerUpdated(DiscordClient discordClient, VoiceServerUpdatedEventArgs voiceServerUpdateEventArgs)
     {
         ArgumentNullException.ThrowIfNull(discordClient);
         ArgumentNullException.ThrowIfNull(voiceServerUpdateEventArgs);
@@ -174,7 +159,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 +168,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 +187,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
@@ -9,9 +9,10 @@
     <!-- Documentation -->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackAsTool>False</PackAsTool>
+    <Version>1.0.4</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DSharpPlus" Version="5.0.0-nightly-02324" />
+    <PackageReference Include="DSharpPlus" Version="5.0.0-nightly-02354" />
     <ProjectReference Include="../Lavalink4NET/Lavalink4NET.csproj" />
   </ItemGroup>
   <Import Project="../Lavalink4NET.targets" />

diff --git a/src/Lavalink4NET.DSharpPlus.Nightly/Lavalink4NETInvokeHandlers.cs 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;
+
+/// <summary>
+/// Forwards event triggers to the Lavalink4NET client wrapper
+/// </summary>
+internal sealed class Lavalink4NETInvokeHandlers(IDiscordClientWrapper wrapper) :
+    IEventHandler<GuildDownloadCompletedEventArgs>,
+    IEventHandler<VoiceServerUpdatedEventArgs>,
+    IEventHandler<VoiceStateUpdatedEventArgs>
+{
+    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
@@ -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<DiscordClientWrapper>();
+
+        services.AddLavalink<DiscordClientWrapper>();
+        services.ConfigureEventHandlers(events => events.AddEventHandlers<Lavalink4NETInvokeHandlers>(ServiceLifetime.Transient));
+
+        return services;
     }
 }