fix(interactivity): Remove event unregistration and clean up dispose (#2041)

Plerx2493 · web-flow · commit 2c9e98295f1d · 2024-07-27T18:00:55.000+02:00
* fix(interactivity): Remove event unregistration and clean up dispose

* Also fix dispose methods in ReactionCollector
diff --git a/DSharpPlus.Interactivity/EventHandling/EventWaiter.cs b/DSharpPlus.Interactivity/EventHandling/EventWaiter.cs
@@ -128,24 +128,10 @@ public void Dispose()
         {
             return;
         }
-
+        
         this.disposed = true;
-
-        if (this.@event != null && this.handler != null)
-        {
-            this.@event.Unregister(this.handler);
-        }
-
-        this.@event = null!;
-        this.handler = null!;
-        this.client = null!;
-
-        this.matchrequests?.Clear();
-
-        this.collectrequests?.Clear();
-
-        this.matchrequests = null!;
-        this.collectrequests = null!;
+        this.matchrequests.Clear();
+        this.collectrequests.Clear();
 
         // Satisfy rule CA1816. Can be removed if this class is sealed.
         GC.SuppressFinalize(this);
diff --git a/DSharpPlus.Interactivity/EventHandling/ReactionCollector.cs b/DSharpPlus.Interactivity/EventHandling/ReactionCollector.cs
@@ -161,32 +161,7 @@ private Task HandleReactionClear(DiscordClient client, MessageReactionsClearedEv
     /// </summary>
     public void Dispose()
     {
-        this.client = null!;
-
-        if (this.reactionAddHandler != null)
-        {
-            this.reactionAddEvent?.Unregister(this.reactionAddHandler);
-        }
-
-        if (this.reactionRemoveHandler != null)
-        {
-            this.reactionRemoveEvent?.Unregister(this.reactionRemoveHandler);
-        }
-
-        if (this.reactionClearHandler != null)
-        {
-            this.reactionClearEvent?.Unregister(this.reactionClearHandler);
-        }
-
-        this.reactionAddEvent = null!;
-        this.reactionAddHandler = null!;
-        this.reactionRemoveEvent = null!;
-        this.reactionRemoveHandler = null!;
-        this.reactionClearEvent = null!;
-        this.reactionClearHandler = null!;
-
-        this.requests?.Clear();
-        this.requests = null!;
+        this.requests.Clear();
 
         // Satisfy rule CA1816. Can be removed if this class is sealed.
         GC.SuppressFinalize(this);
@@ -214,10 +189,7 @@ public ReactionCollectRequest(DiscordMessage msg, TimeSpan timeout)
     public void Dispose()
     {
         this.ct.Dispose();
-        this.tcs = null;
-        this.message = null;
-        this.collected?.Clear();
-        this.collected = null;
+        this.collected.Clear();
 
         // Satisfy rule CA1816. Can be removed if this class is sealed.
         GC.SuppressFinalize(this);
