Merge pull request #565 from TheTrackerCouncil/fix-msu-messages

Fix MSU messages
TheTrackerCouncil · Sep 15, 2024 · 1476c70 · 1476c70
2 parents a4f315b + f6d5119
commit 1476c70
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/TrackerCouncil.Smz3.Chat.Twitch/Models/TwitchPoll.cs b/src/TrackerCouncil.Smz3.Chat.Twitch/Models/TwitchPoll.cs
@@ -36,7 +36,7 @@ public class TwitchPoll : TwitchAPIResponse
     /// </summary>
     public bool IsPollSuccessful => WinningChoice?.Votes > 0;
 
-    public bool WasPollTerminated => "TERMINATED".Equals(Status, StringComparison.OrdinalIgnoreCase);
+    public bool WasPollTerminated => "TERMINATED".Equals(Status, StringComparison.OrdinalIgnoreCase) || "ARCHIVED".Equals(Status, StringComparison.OrdinalIgnoreCase);
 
     /// <summary>
     /// Returns choice that was voted on the most

diff --git a/src/TrackerCouncil.Smz3.Data/Configuration/ConfigServiceCollectionExtensions.cs b/src/TrackerCouncil.Smz3.Data/Configuration/ConfigServiceCollectionExtensions.cs
@@ -7,10 +7,10 @@ public static class ConfigServiceCollectionExtensions
 {
     public static IServiceCollection AddConfigs(this IServiceCollection services)
     {
-        services.AddSingleton<Smz3.Data.Configuration.ConfigProvider>();
+        services.AddSingleton<ConfigProvider>();
         services.AddTransient(serviceProvider =>
         {
-            var configProvider = serviceProvider.GetRequiredService<Smz3.Data.Configuration.ConfigProvider>();
+            var configProvider = serviceProvider.GetRequiredService<ConfigProvider>();
             return configProvider.GetMapConfig();
         });
 

diff --git a/src/TrackerCouncil.Smz3.Tracking/VoiceCommands/MsuModule.cs b/src/TrackerCouncil.Smz3.Tracking/VoiceCommands/MsuModule.cs
@@ -9,6 +9,7 @@
 using MSURandomizerLibrary.Models;
 using MSURandomizerLibrary.Services;
 using TrackerCouncil.Smz3.Abstractions;
+using TrackerCouncil.Smz3.Data.Configuration;
 using TrackerCouncil.Smz3.Data.Configuration.ConfigFiles;
 using TrackerCouncil.Smz3.Tracking.Services;
 
@@ -40,7 +41,7 @@ public class MsuModule : TrackerModule, IDisposable
     /// <param name="msuMonitorService"></param>
     /// <param name="msuTypeService"></param>
     /// <param name="msuUserOptionsService"></param>
-    /// <param name="msuConfig"></param>
+    /// <param name="config"></param>
     /// <param name="gameService"></param>
     public MsuModule(
         TrackerBase tracker,
@@ -51,14 +52,14 @@ public MsuModule(
         IMsuMonitorService msuMonitorService,
         IMsuTypeService msuTypeService,
         IMsuUserOptionsService msuUserOptionsService,
-        MsuConfig msuConfig,
+        Configs config,
         IGameService gameService)
         : base(tracker, itemService, worldService, logger)
     {
         _gameService = gameService;
         _msuMonitorService = msuMonitorService;
         var msuType = msuTypeService.GetSMZ3MsuType();
-        _msuConfig = msuConfig;
+        _msuConfig = config.MsuConfig;
         _validTrackNumbers = msuType!.ValidTrackNumbers;
 
         if (!File.Exists(tracker.RomPath))

diff --git a/src/TrackerCouncil.Smz3.UI/TrackerCouncil.Smz3.UI.csproj b/src/TrackerCouncil.Smz3.UI/TrackerCouncil.Smz3.UI.csproj
@@ -6,7 +6,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-        <Version>9.8.4</Version>
+        <Version>9.8.5</Version>
         <AssemblyName>SMZ3CasRandomizer</AssemblyName>
         <ApplicationIcon>Assets\smz3.ico</ApplicationIcon>
         <RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>