Fix booster command sometimes becoming unresponsive

Citrinate · Sep 7, 2024 · b526584 · b526584
1 parent 72592b3
commit b526584
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/BoosterManager/Boosters/BoosterQueue.cs b/BoosterManager/Boosters/BoosterQueue.cs
@@ -9,7 +9,7 @@
 using BoosterManager.Localization;
 
 namespace BoosterManager {
-	internal sealed class BoosterQueue {
+	internal sealed class BoosterQueue : IDisposable {
 		private readonly Bot Bot;
 		private readonly Timer Timer;
 		private readonly ConcurrentHashSet<Booster> Boosters = new(new BoosterComparer());
@@ -37,6 +37,10 @@ internal BoosterQueue(Bot bot) {
 				Timeout.Infinite
 			);
 		}
+
+		public void Dispose() {
+			Timer.Dispose();
+		}
 
 		internal void Start() {
 			Utilities.InBackground(async() => await Run().ConfigureAwait(false));

diff --git a/BoosterManager/Handlers/BoosterHandler.cs b/BoosterManager/Handlers/BoosterHandler.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 
 namespace BoosterManager {
-	internal sealed class BoosterHandler {
+	internal sealed class BoosterHandler : IDisposable {
 		private readonly Bot Bot;
 		internal BoosterDatabase BoosterDatabase { get; private set; }
 		internal readonly BoosterQueue BoosterQueue;
@@ -24,14 +24,15 @@ private BoosterHandler(Bot bot, BoosterDatabase boosterDatabase) {
 			BoosterQueue = new BoosterQueue(Bot);
 		}
 
+		public void Dispose() {
+			BoosterQueue.Dispose();
+		}
+
 		internal static void AddHandler(Bot bot, BoosterDatabase boosterDatabase) {
 			if (BoosterHandlers.ContainsKey(bot.BotName)) {
-				// Bot's config was reloaded, cancel and then restore jobs
 				BoosterHandlers[bot.BotName].CancelBoosterJobs();
-				BoosterHandlers[bot.BotName].BoosterDatabase = boosterDatabase;
-				BoosterHandlers[bot.BotName].RestoreBoosterJobs();
-
-				return;
+				BoosterHandlers[bot.BotName].Dispose();
+				BoosterHandlers.TryRemove(bot.BotName, out BoosterHandler? _);
 			}
 
 			BoosterHandler handler = new BoosterHandler(bot, boosterDatabase);