From cceae30d5ea91e39535f665325a34e3746cc3fe7 Mon Sep 17 00:00:00 2001
From: Cameron <cameronneville1994@gmail.com>
Date: Thu, 21 Mar 2024 09:15:30 -0500
Subject: [PATCH] attempted fix to RateLimiter, not fully tested yet

---
 TwitchIrcClient/IRC/RateLimiter.cs | 53 +++++++++++++++++-------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/TwitchIrcClient/IRC/RateLimiter.cs b/TwitchIrcClient/IRC/RateLimiter.cs
index c459467..3a93de7 100644
--- a/TwitchIrcClient/IRC/RateLimiter.cs
+++ b/TwitchIrcClient/IRC/RateLimiter.cs
@@ -29,28 +29,35 @@ namespace TwitchIrcClient.IRC
             Timer.Start();
         }
 
-        public void WaitForAvailable(CancellationToken? token = null)
+        public bool WaitForAvailable(CancellationToken? token = null)
         {
             try
             {
-                if (token is CancellationToken actualToken)
-                    Semaphore.Wait(actualToken);
-                else
-                    Semaphore.Wait();
+                lock (Semaphore)
+                {
+                    if (token is CancellationToken actualToken)
+                        Semaphore.Wait(actualToken);
+                    else
+                        Semaphore.Wait();
+                    return true;
+                }
             }
             catch (OperationCanceledException)
             {
-                //caller is responsible for checking whether connection is cancelled before trying to send
+                return false;
             }
         }
         public bool WaitForAvailable(TimeSpan timeout, CancellationToken? token = null)
         {
             try
             {
-                if (token is CancellationToken actualToken)
-                    return Semaphore.Wait(timeout, actualToken);
-                else
-                    return Semaphore.Wait(timeout);
+                lock (Semaphore)
+                {
+                    if (token is CancellationToken actualToken)
+                        return Semaphore.Wait(timeout, actualToken);
+                    else
+                        return Semaphore.Wait(timeout);
+                }
             }
             catch (OperationCanceledException)
             {
@@ -61,10 +68,13 @@ namespace TwitchIrcClient.IRC
         {
             try
             {
-                if (token is CancellationToken actualToken)
-                    return Semaphore.Wait(millis, actualToken);
-                else
-                    return Semaphore.Wait(millis);
+                lock (Semaphore)
+                {
+                    if (token is CancellationToken actualToken)
+                        return Semaphore.Wait(millis, actualToken);
+                    else
+                        return Semaphore.Wait(millis);
+                }
             }
             catch (OperationCanceledException)
             {
@@ -76,16 +86,13 @@ namespace TwitchIrcClient.IRC
         {
             try
             {
-                Semaphore.Release(MessageLimit);
-            }
-            catch (SemaphoreFullException)
-            {
-
-            }
-            catch (ObjectDisposedException)
-            {
-
+                lock (Semaphore)
+                {
+                    Semaphore.Release(MessageLimit - Semaphore.CurrentCount);
+                }
             }
+            catch (SemaphoreFullException)  { }
+            catch (ObjectDisposedException) { }
         }
 
         #region RateLimiter Dispose