Add an optional VoiceUser to the user connect and disconnect event args

OoLunar · Mar 29, 2024 · 523efb4 · 523efb4
1 parent dee2806
commit 523efb4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/DSharpPlus.VoiceLink/EventArgs/VoiceLinkUserEventArgs.cs b/src/DSharpPlus.VoiceLink/EventArgs/VoiceLinkUserEventArgs.cs
@@ -7,5 +7,6 @@ public sealed class VoiceLinkUserEventArgs : AsyncEventArgs
     {
         public required VoiceLinkConnection Connection { get; init; }
         public required DiscordMember Member { get; init; }
+        public required VoiceLinkUser? VoiceUser { get; init; }
     }
 }
diff --git a/src/DSharpPlus.VoiceLink/VoiceLinkConnection.VoiceGatewayHandlers.cs b/src/DSharpPlus.VoiceLink/VoiceLinkConnection.VoiceGatewayHandlers.cs
@@ -139,7 +139,8 @@ private static async ValueTask ClientConnectedAsync(VoiceLinkConnection connecti
             await connection.Extension._userConnected.InvokeAsync(connection.Extension, new VoiceLinkUserEventArgs()
             {
                 Connection = connection,
-                Member = await connection.Guild.GetMemberAsync(voiceClientConnectedPayload.UserId)
+                Member = await connection.Guild.GetMemberAsync(voiceClientConnectedPayload.UserId),
+                VoiceUser = null
             });
         }
 
@@ -151,16 +152,21 @@ private static async ValueTask ClientDisconnectAsync(VoiceLinkConnection connect
             // We only receive a member's SSRC when they speak. This means they may not be within the speakers dictionary.
             // Since we're going to be receiving a lot more RTP packets than speaking payloads, we index by the SSRC.
             // This means we need to iterate through the speakers dictionary to find the user instead of just indexing.
-            if (connection._speakers.FirstOrDefault(x => x.Value.Member.Id == voiceClientDisconnectedPayload.UserId) is (uint ssrc, VoiceLinkUser voiceLinkUser))
+            if (connection._speakers.FirstOrDefault(x => x.Value.Member.Id == voiceClientDisconnectedPayload.UserId) is (uint, VoiceLinkUser) kvp)
             {
-                connection._speakers.Remove(ssrc);
-                voiceLinkUser._audioPipe.Writer.Complete();
+                connection._speakers.Remove(kvp.Key);
+                kvp.Value._audioPipe.Writer.Complete();
+            }
+            else
+            {
+                kvp = default;
             }
 
             await connection.Extension._userDisconnected.InvokeAsync(connection.Extension, new VoiceLinkUserEventArgs()
             {
                 Connection = connection,
-                Member = await connection.Guild.GetMemberAsync(voiceClientDisconnectedPayload.UserId)
+                Member = await connection.Guild.GetMemberAsync(voiceClientDisconnectedPayload.UserId),
+                VoiceUser = kvp.Value
             });
         }