Simplified the fetching of the game from the settings

leMicin · leMicin · commit 83379c0aaa5a · 2025-09-09T17:59:01.000-04:00
diff --git a/src/Sidekick.Apis.Poe.Trade/Filters/FilterProvider.cs b/src/Sidekick.Apis.Poe.Trade/Filters/FilterProvider.cs
@@ -3,7 +3,6 @@
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
 using Sidekick.Common.Exceptions;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game.Languages;
 using Sidekick.Common.Settings;
 
@@ -44,8 +43,7 @@ IInvariantFilterProvider invariantFilterProvider
     /// <inheritdoc/>
     public async Task Initialize()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"{game.GetValueAttribute()}_InvariantFilters";
 
         var result = await cacheProvider.GetOrSet(cacheKey,
diff --git a/src/Sidekick.Apis.Poe.Trade/Filters/InvariantFilterProvider.cs b/src/Sidekick.Apis.Poe.Trade/Filters/InvariantFilterProvider.cs
@@ -3,7 +3,6 @@
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
 using Sidekick.Common.Exceptions;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game.Languages;
 using Sidekick.Common.Settings;
 
@@ -29,8 +28,7 @@ IGameLanguageProvider gameLanguageProvider
     /// <inheritdoc/>
     public async Task Initialize()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"{game.GetValueAttribute()}_Filters";
 
         var result = await cacheProvider.GetOrSet(cacheKey,
diff --git a/src/Sidekick.Apis.Poe.Trade/Items/ApiInvariantItemProvider.cs b/src/Sidekick.Apis.Poe.Trade/Items/ApiInvariantItemProvider.cs
@@ -4,7 +4,6 @@
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
 using Sidekick.Common.Exceptions;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Game.Languages;
@@ -37,8 +36,7 @@ public async Task Initialize()
     {
         IdDictionary.Clear();
 
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"{game.GetValueAttribute()}_InvariantItems";
 
         var result = await cacheProvider.GetOrSet(cacheKey, () => tradeApiClient.FetchData<ApiCategory>(game, gameLanguageProvider.InvariantLanguage, "items"), (cache) => cache.Result.Any());
diff --git a/src/Sidekick.Apis.Poe.Trade/Items/ApiItemProvider.cs b/src/Sidekick.Apis.Poe.Trade/Items/ApiItemProvider.cs
@@ -5,7 +5,6 @@
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
 using Sidekick.Common.Exceptions;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Game.Languages;
@@ -40,8 +39,7 @@ public async Task Initialize()
         IdDictionary.Clear();
         NameAndTypeRegex.Clear();
 
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"{game.GetValueAttribute()}_Items";
 
         var result = await cacheProvider.GetOrSet(cacheKey, () => tradeApiClient.FetchData<ApiCategory>(game, gameLanguageProvider.Language, "items"), (cache) => cache.Result.Any());
diff --git a/src/Sidekick.Apis.Poe.Trade/Modifiers/InvariantModifierProvider.cs b/src/Sidekick.Apis.Poe.Trade/Modifiers/InvariantModifierProvider.cs
@@ -3,7 +3,6 @@
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
 using Sidekick.Common.Exceptions;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game.Languages;
 using Sidekick.Common.Settings;
 
@@ -139,8 +138,7 @@ private static bool IsCategory(ApiCategory apiCategory, string? key)
 
     public async Task<List<ApiCategory>> GetList()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"{game.GetValueAttribute()}_InvariantModifiers";
 
         var apiCategories = await cacheProvider.GetOrSet(cacheKey,
diff --git a/src/Sidekick.Apis.Poe.Trade/Modifiers/ModifierProvider.cs b/src/Sidekick.Apis.Poe.Trade/Modifiers/ModifierProvider.cs
@@ -5,7 +5,6 @@
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
 using Sidekick.Common.Exceptions;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Game.Languages;
 using Sidekick.Common.Settings;
@@ -56,8 +55,7 @@ public static string RemoveSquareBrackets(string text)
     /// <inheritdoc/>
     public async Task Initialize()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"{game.GetValueAttribute()}_Modifiers";
         var apiCategories = await cacheProvider.GetOrSet(cacheKey, () => tradeApiClient.FetchData<ApiCategory>(game, gameLanguageProvider.Language, "stats"), (cache) => cache.Result.Any());
         if (apiCategories == null) throw new SidekickException("Could not fetch modifiers from the trade API.");
diff --git a/src/Sidekick.Apis.Poe.Trade/Parser/Headers/ItemClassParser.cs b/src/Sidekick.Apis.Poe.Trade/Parser/Headers/ItemClassParser.cs
@@ -6,7 +6,6 @@
 using Sidekick.Apis.Poe.Trade.Fuzzy;
 using Sidekick.Apis.Poe.Trade.Parser.Headers.Models;
 using Sidekick.Common.Enums;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Game.Languages;
@@ -30,8 +29,7 @@ ISettingsService settingsService
 
     public async Task Initialize()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
 
         ItemClassDefinitions = GetItemClassDefinitions(game);
         ApiItemClassDefinitions = GetApiItemClassDefinitions();
diff --git a/src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/FracturedProperty.cs b/src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/FracturedProperty.cs
@@ -3,7 +3,6 @@
 using Sidekick.Apis.Poe.Trade.Parser.Properties.Filters;
 using Sidekick.Apis.Poe.Trade.Trade.Requests;
 using Sidekick.Apis.Poe.Trade.Trade.Requests.Filters;
-using Sidekick.Common.Game;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Settings;
 
diff --git a/src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/MirroredProperty.cs b/src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/MirroredProperty.cs
@@ -3,7 +3,6 @@
 using Sidekick.Apis.Poe.Trade.Parser.Properties.Filters;
 using Sidekick.Apis.Poe.Trade.Trade.Requests;
 using Sidekick.Apis.Poe.Trade.Trade.Requests.Filters;
-using Sidekick.Common.Game;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Settings;
 
diff --git a/src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/SeparatorProperty.cs b/src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/SeparatorProperty.cs
@@ -1,6 +1,5 @@
 using Sidekick.Apis.Poe.Trade.Parser.Properties.Filters;
 using Sidekick.Apis.Poe.Trade.Trade.Requests;
-using Sidekick.Apis.Poe.Trade.Trade.Requests.Filters;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Settings;
 
diff --git a/src/Sidekick.Apis.Poe.Trade/Parser/Properties/PropertyDefinition.cs b/src/Sidekick.Apis.Poe.Trade/Parser/Properties/PropertyDefinition.cs
@@ -2,7 +2,6 @@
 using System.Text.RegularExpressions;
 using Sidekick.Apis.Poe.Trade.Parser.Properties.Filters;
 using Sidekick.Apis.Poe.Trade.Trade.Requests;
-using Sidekick.Apis.Poe.Trade.Trade.Requests.Filters;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Settings;
 
diff --git a/src/Sidekick.Apis.Poe.Trade/Parser/Properties/PropertyParser.cs b/src/Sidekick.Apis.Poe.Trade/Parser/Properties/PropertyParser.cs
@@ -6,7 +6,6 @@
 using Sidekick.Apis.Poe.Trade.Parser.Properties.Definitions;
 using Sidekick.Apis.Poe.Trade.Parser.Properties.Filters;
 using Sidekick.Apis.Poe.Trade.Trade.Requests;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Game.Languages;
 using Sidekick.Common.Settings;
@@ -31,8 +30,7 @@ IInvariantModifierProvider invariantModifierProvider
 
     public async Task Initialize()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
 
         Definitions.Clear();
         Definitions.AddRange([
diff --git a/src/Sidekick.Apis.Poe.Trade/Parser/Pseudo/PseudoParser.cs b/src/Sidekick.Apis.Poe.Trade/Parser/Pseudo/PseudoParser.cs
@@ -1,7 +1,5 @@
 using Sidekick.Apis.Poe.Trade.Modifiers;
 using Sidekick.Apis.Poe.Trade.Parser.Pseudo.Definitions;
-using Sidekick.Common;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Settings;
 
@@ -22,8 +20,7 @@ ISettingsService settingsService
     /// <inheritdoc/>
     public async Task Initialize()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
 
         Definitions.Clear();
         Definitions.AddRange([
diff --git a/src/Sidekick.Apis.Poe.Trade/Static/ItemStaticDataProvider.cs b/src/Sidekick.Apis.Poe.Trade/Static/ItemStaticDataProvider.cs
@@ -3,7 +3,6 @@
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
 using Sidekick.Common.Exceptions;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game.Items;
 using Sidekick.Common.Game.Languages;
 using Sidekick.Common.Settings;
@@ -28,8 +27,7 @@ ISettingsService settingsService
     /// <inheritdoc/>
     public async Task Initialize()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"{game.GetValueAttribute()}_StaticData";
         var result = await cacheProvider.GetOrSet(cacheKey, () => tradeApiClient.FetchData<StaticItemCategory>(game, gameLanguageProvider.Language, "static"), (cache) => cache.Result.Any());
         if (result == null) throw new SidekickException("Could not fetch data from the trade API.");
diff --git a/src/Sidekick.Apis.Poe.Trade/Trade/Results/TradeResult.cs b/src/Sidekick.Apis.Poe.Trade/Trade/Results/TradeResult.cs
@@ -1,4 +1,3 @@
-using Sidekick.Apis.Poe.Trade.Models;
 using Sidekick.Apis.Poe.Trade.Models.Items;
 
 namespace Sidekick.Apis.Poe.Trade.Trade.Results;
diff --git a/src/Sidekick.Apis.Poe2Scout/Categories/ScoutCategoryProvider.cs b/src/Sidekick.Apis.Poe2Scout/Categories/ScoutCategoryProvider.cs
@@ -2,7 +2,6 @@
 using Sidekick.Apis.Poe2Scout.Clients;
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Settings;
 namespace Sidekick.Apis.Poe2Scout.Categories;
 
@@ -25,8 +24,7 @@ public async Task<List<ScoutCategory>> GetCurrencyCategories()
 
     private async Task<ApiCategoriesResult?> GetCategories()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"poe2scout.{game.GetValueAttribute()}.categories";
 
         return await cacheProvider.GetOrSet(cacheKey, Fetch, (result) => result.CurrencyCategories.Count > 0 && result.UniqueCategories.Count > 0);
diff --git a/src/Sidekick.Apis.Poe2Scout/Items/ScoutItemProvider.cs b/src/Sidekick.Apis.Poe2Scout/Items/ScoutItemProvider.cs
@@ -4,7 +4,6 @@
 using Sidekick.Apis.Poe2Scout.Items.Models;
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Settings;
 namespace Sidekick.Apis.Poe2Scout.Items;
 
@@ -33,8 +32,7 @@ private async Task<List<ScoutItem>> GetOrFetchItems()
     {
         if (Items != null) return Items;
 
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"poe2scout.{game.GetValueAttribute()}.items";
 
         Items = await cacheProvider.GetOrSet(cacheKey, FetchAllItems, (result) => result.Count > 0);
@@ -55,8 +53,7 @@ private async Task<List<ScoutItem>> FetchAllItems()
 
     private async Task<List<ScoutItem>> GetOrFetchItemsByCategories()
     {
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
+        var game = await settingsService.GetGame();
         var cacheKey = $"poe2scout.{game.GetValueAttribute()}.items";
 
         var uniqueCategories = await categoryProvider.GetUniqueCategories();
diff --git a/src/Sidekick.Common.Ui/App/AppUpdate.razor b/src/Sidekick.Common.Ui/App/AppUpdate.razor
@@ -1,7 +1,6 @@
 @using Sidekick.Apis.GitHub;
 @using Sidekick.Apis.GitHub.Models;
 @using Sidekick.Common.Ui.Localization
-@using Sidekick.Common.Browser;
 
 @if (Release is
      {
diff --git a/src/Sidekick.Common.Updater/AutoUpdater.cs b/src/Sidekick.Common.Updater/AutoUpdater.cs
@@ -1,9 +1,6 @@
-using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using Sidekick.Common.Exceptions;
 using Velopack;
-using Velopack.Locators;
-using Velopack.Logging;
 
 namespace Sidekick.Common.Updater;
 
diff --git a/src/Sidekick.Common/Platform/Input/KeybindHandler.cs b/src/Sidekick.Common/Platform/Input/KeybindHandler.cs
@@ -1,4 +1,3 @@
-using Sidekick.Common.Initialization;
 using Sidekick.Common.Settings;
 
 namespace Sidekick.Common.Platform.Input;
diff --git a/src/Sidekick.Common/Settings/ISettingsService.cs b/src/Sidekick.Common/Settings/ISettingsService.cs
@@ -1,3 +1,4 @@
+using Sidekick.Common.Game;
 namespace Sidekick.Common.Settings;
 
 public interface ISettingsService
@@ -8,6 +9,8 @@ public interface ISettingsService
     /// <param name="keys">The keys of the settings that have changed.</param>
     event Action<string[]>? OnSettingsChanged;
 
+    Task<GameType> GetGame();
+
     /// <summary>
     /// Gets a setting by its key.
     /// </summary>
diff --git a/src/Sidekick.Common/Settings/SettingsService.cs b/src/Sidekick.Common/Settings/SettingsService.cs
@@ -5,6 +5,8 @@
 using Sidekick.Common.Database;
 using Sidekick.Common.Database.Tables;
 using Sidekick.Common.Enums;
+using Sidekick.Common.Extensions;
+using Sidekick.Common.Game;
 
 namespace Sidekick.Common.Settings;
 
@@ -14,6 +16,12 @@ public class SettingsService(
 {
     public event Action<string[]>? OnSettingsChanged;
 
+    public async Task<GameType> GetGame()
+    {
+        var leagueId = await GetString(SettingKeys.LeagueId);
+        return leagueId.GetGameFromLeagueId();
+    }
+
     public async Task<bool> GetBool(string key)
     {
         await using var dbContext = new SidekickDbContext(dbContextOptions);
diff --git a/src/Sidekick.Modules.General/Keybinds/FindItemKeybindHandler.cs b/src/Sidekick.Modules.General/Keybinds/FindItemKeybindHandler.cs
@@ -1,4 +1,3 @@
-using Sidekick.Apis.Poe;
 using Sidekick.Apis.Poe.Trade;
 using Sidekick.Common.Platform;
 using Sidekick.Common.Platform.Input;
diff --git a/src/Sidekick.Modules.General/Keybinds/OpenInCraftOfExileHandler.cs b/src/Sidekick.Modules.General/Keybinds/OpenInCraftOfExileHandler.cs
@@ -1,5 +1,4 @@
 using Sidekick.Common.Browser;
-using Sidekick.Common.Extensions;
 using Sidekick.Common.Game;
 using Sidekick.Common.Platform;
 using Sidekick.Common.Platform.Input;
@@ -39,9 +38,7 @@ public override async Task Execute(string keybind)
             return;
         }
 
-        var leagueId = await settingsService.GetString(SettingKeys.LeagueId);
-        var game = leagueId.GetGameFromLeagueId();
-
+        var game = await settingsService.GetGame();
         var gameParam = game == GameType.PathOfExile ? "poe1" : "poe2";
         var encodedItemText = Uri.EscapeDataString(itemText);
 
diff --git a/src/Sidekick.Modules.General/Keybinds/OpenWikiPageKeybindHandler.cs b/src/Sidekick.Modules.General/Keybinds/OpenWikiPageKeybindHandler.cs
@@ -1,4 +1,3 @@
-using Sidekick.Apis.Poe;
 using Sidekick.Apis.Poe.Trade;
 using Sidekick.Common.Browser;
 using Sidekick.Common.Exceptions;
diff --git a/src/Sidekick.Modules.General/Settings/Game/GameSettingsPage.razor b/src/Sidekick.Modules.General/Settings/Game/GameSettingsPage.razor
@@ -1,5 +1,4 @@
 @using Microsoft.Extensions.Localization
-@using Sidekick.Common
 @using Sidekick.Common.Platform
 @using Sidekick.Common.Settings
 @using Sidekick.Common.Ui.Views
diff --git a/src/Sidekick.Modules.Maps/MapOverlay.razor b/src/Sidekick.Modules.Maps/MapOverlay.razor
@@ -1,6 +1,5 @@
 @page "/map/{itemText}"
 @using System.Text.RegularExpressions
-@using Sidekick.Apis.Poe
 @using Sidekick.Apis.Poe.Trade
 @using Sidekick.Common.Game
 @using Sidekick.Common.Settings
diff --git a/src/Sidekick.Modules.Trade/Components/Prices/PriceRangeDisplay.razor b/src/Sidekick.Modules.Trade/Components/Prices/PriceRangeDisplay.razor
@@ -1,5 +1,4 @@
 @using Sidekick.Apis.Poe.Trade.Static
-@using Sidekick.Apis.Poe
 
 <div class="flex flex-nowrap gap-1 items-center">
     <Heading2>@Min.ToString("0.#")</Heading2>
diff --git a/src/Sidekick.Modules.Trade/Settings/PriceCheckItemCurrencyEditor.razor b/src/Sidekick.Modules.Trade/Settings/PriceCheckItemCurrencyEditor.razor
@@ -1,6 +1,5 @@
 @using Sidekick.Apis.Poe.Trade.Filters
 @using Sidekick.Apis.Poe.Trade.Static
-@using Sidekick.Common.Extensions
 @using Sidekick.Common.Game
 @using Sidekick.Modules.Trade.Localization
 @using Sidekick.Common.Settings
@@ -77,8 +76,7 @@
 
     private async Task FetchSettings()
     {
-        var league = await SettingsService.GetString(SettingKeys.LeagueId);
-        var game = league.GetGameFromLeagueId();
+        var game = await SettingsService.GetGame();
         Currency = game == GameType.PathOfExile ? await SettingsService.GetString(SettingKeys.PriceCheckCurrency) : await SettingsService.GetString(SettingKeys.PriceCheckCurrencyPoE2);
         Currency = FilterProvider.GetPriceOption(Currency);
     }
@@ -87,8 +85,7 @@
     {
         Currency = value;
 
-        var league = await SettingsService.GetString(SettingKeys.LeagueId);
-        var game = league.GetGameFromLeagueId();
+        var game = await SettingsService.GetGame();
         if (game == GameType.PathOfExile)
         {
             await SettingsService.Set(SettingKeys.PriceCheckCurrency, value);
diff --git a/src/Sidekick.Modules.Trade/Settings/PriceCheckItemMinMaxPriceEditor.razor b/src/Sidekick.Modules.Trade/Settings/PriceCheckItemMinMaxPriceEditor.razor
diff --git a/src/Sidekick.Modules.Trade/Settings/PriceCheckStatusEditor.razor b/src/Sidekick.Modules.Trade/Settings/PriceCheckStatusEditor.razor
diff --git a/src/Sidekick.Modules.Trade/Trade/ItemOptions.razor b/src/Sidekick.Modules.Trade/Trade/ItemOptions.razor
diff --git a/src/Sidekick.Modules.Trade/Trade/OpenWebsiteLink.razor b/src/Sidekick.Modules.Trade/Trade/OpenWebsiteLink.razor
diff --git a/src/Sidekick.Modules.Trade/Unique/UniqueTab.razor b/src/Sidekick.Modules.Trade/Unique/UniqueTab.razor
diff --git a/src/Sidekick.Modules.Wealth/WealthView.razor b/src/Sidekick.Modules.Wealth/WealthView.razor
diff --git a/src/Sidekick.PhotinoBlazor/Program.cs b/src/Sidekick.PhotinoBlazor/Program.cs
diff --git a/src/Sidekick.Web/Pages/_Host.cshtml b/src/Sidekick.Web/Pages/_Host.cshtml
