Merge pull request #853 from Sidekick-Poe/feature/ninja-exchange

Overhauled Poe.Ninja integration in Sidekick

Author: leMicin

data/poe1.ninja.items.json

@@ -91,10 +91,11 @@ private void FillCategoryItems(List<ApiCategory> categories, string categoryId,
             information.InvariantText = apiData?.Text;
             information.Image = apiData?.Image;
 
-            if (string.IsNullOrEmpty(information.InvariantText) && gameLanguageProvider.IsEnglish())
+            if (gameLanguageProvider.IsEnglish())
             {
                 information.InvariantName = entry.Name;
-                information.InvariantText = entry.Text;
+                information.InvariantType = entry.Type;
+                if (string.IsNullOrEmpty(information.InvariantText)) information.InvariantText = entry.Text;
             }
 
             if (!string.IsNullOrEmpty(information.Name))

data/poe2.ninja.items.json

@@ -124,7 +124,7 @@ public int? MaxLinks
     }
 
     [JsonIgnore]
-    public int? GemLevel => GetPropertyValue("Level", 16);
+    public int? GemLevel => GetPropertyValue("Level", 1);
 
     [JsonIgnore]
     public int? MapTier => GetPropertyValue("Map Tier", 16);

src/Sidekick.Apis.Poe.Trade/Items/ApiItemProvider.cs

@@ -21,10 +21,7 @@ public override void ParseAfterModifiers(Item item)
         }
 
         var grant = ParseGrantTexts(item.Modifiers);
-        if (grant == null)
-        {
-            item.Properties.ClusterJewelGrantText = grant;
-        }
+        if (grant != null) item.Properties.ClusterJewelGrantText = grant;
     }
 
     private int ParseSmallPassiveCount(List<Modifier> modifierLines)

src/Sidekick.Apis.Poe.Trade/Models/Items/ApiItem.cs

@@ -2,6 +2,7 @@
 using Sidekick.Apis.Poe.Items;
 using Sidekick.Apis.Poe.Languages;
 using Sidekick.Apis.Poe.Trade.Clients;
+using Sidekick.Apis.Poe.Trade.Clients.Models;
 using Sidekick.Apis.Poe.Trade.Static.Models;
 using Sidekick.Common.Cache;
 using Sidekick.Common.Enums;
@@ -28,25 +29,18 @@ ISettingsService settingsService
     public async Task Initialize()
     {
         var game = await settingsService.GetGame();
-        var cacheKey = $"{game.GetValueAttribute()}_StaticData";
+        await InitializeText(game);
+        await InitializeInvariant(game);
+    }
 
+    private async Task InitializeText(GameType game)
+    {
+        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.");
 
         TextDictionary.Clear();
-        InvariantDictionary.Clear();
-        foreach (var category in result.Result)
-        {
-            foreach (var entry in category.Entries)
-            {
-                if (entry.Id == null! || entry.Text == null || entry.Id == "sep") continue;
-
-                entry.Image = $"https://web.poecdn.com{entry.Image}";
-                TextDictionary.TryAdd(entry.Text, entry);
-            }
-        }
-
-        await InitializeInvariant(game);
+        FillDictionary(TextDictionary, result, x => x.Text);
     }
 
     private async Task InitializeInvariant(GameType game)
@@ -55,14 +49,21 @@ private async Task InitializeInvariant(GameType game)
         var result = await cacheProvider.GetOrSet(cacheKey, () => tradeApiClient.FetchData<StaticItemCategory>(game, gameLanguageProvider.InvariantLanguage, "static"), (cache) => cache.Result.Any());
         if (result == null) throw new SidekickException("Could not fetch invariant data from the trade API.");
 
+        InvariantDictionary.Clear();
+        FillDictionary(InvariantDictionary, result, x => x.Id);
+    }
+
+    private void FillDictionary(Dictionary<string, StaticItem> dictionary, FetchResult<StaticItemCategory> result, Func<StaticItem, string?> keyFunc)
+    {
         foreach (var category in result.Result)
         {
             foreach (var entry in category.Entries)
             {
-                if (entry.Id == null! || entry.Text == null || entry.Id == "sep") continue;
+                var key = keyFunc(entry);
+                if (key == null || entry.Id == null! || entry.Text == null || entry.Id == "sep") continue;
 
                 entry.Image = $"https://web.poecdn.com{entry.Image}";
-                InvariantDictionary.TryAdd(entry.Id, entry);
+                dictionary.TryAdd(key, entry);
             }
         }
     }

src/Sidekick.Apis.Poe.Trade/Parser/Properties/Definitions/ClusterJewelPassiveCountProperty.cs

@@ -10,6 +10,8 @@ public class ItemApiInformation
 
     public string? InvariantName { get; set; }
 
+    public string? InvariantType { get; set; }
+
     public string? Image { get; set; }
 
     public string? Name { get; set; }

src/Sidekick.Apis.Poe.Trade/Static/ApiStaticDataProvider.cs

@@ -1,4 +1,5 @@
 using Sidekick.Apis.Poe.Extensions;
+using Sidekick.Apis.Poe.Items;
 using Sidekick.Apis.Poe2Scout.Categories;
 using Sidekick.Apis.Poe2Scout.Categories.Models;
 using Sidekick.Apis.Poe2Scout.Clients;
@@ -19,6 +20,9 @@ public class ScoutItemProvider(
 
     public async Task<ScoutItem?> GetItem(string? text)
     {
+        var game = await settingsService.GetGame();
+        if (game == GameType.PathOfExile) return null;
+
         if (string.IsNullOrEmpty(text)) return null;
 
         var items = await GetOrFetchItems();