Merge pull request #216 from Sidekick-Poe/bugfix/invariant-info

Update InvariantMetadataProvider
Sidekick-Poe · Aug 1, 2024 · bf866d0 · bf866d0
2 parents feab247 + 9e0af21
commit bf866d0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 83 deletions.
diff --git a/src/Sidekick.Apis.Poe/Metadatas/InvariantMetadataProvider.cs b/src/Sidekick.Apis.Poe/Metadatas/InvariantMetadataProvider.cs
@@ -37,24 +37,24 @@ public async Task Initialize()
                 "InvariantMetadata",
                 () => poeTradeClient.Fetch<ApiCategory>("data/items", useDefaultLanguage: true));
 
-            FillPattern(result.Result, "accessories", Category.Accessory, useRegex: true);
+            FillPattern(result.Result, "accessory", Category.Accessory, useRegex: true);
             FillPattern(result.Result, "armour", Category.Armour, useRegex: true);
-            FillPattern(result.Result, "cards", Category.DivinationCard);
+            FillPattern(result.Result, "card", Category.DivinationCard);
             FillPattern(result.Result, "currency", Category.Currency);
-            FillPattern(result.Result, "flasks", Category.Flask, useRegex: true);
-            FillPattern(result.Result, "gems", Category.Gem);
-            FillPattern(result.Result, "jewels", Category.Jewel, useRegex: true);
-            FillPattern(result.Result, "maps", Category.Map, useRegex: true);
-            FillPattern(result.Result, "weapons", Category.Weapon, useRegex: true);
-            FillPattern(result.Result, "leaguestones", Category.Leaguestone);
-            FillPattern(result.Result, "monsters", Category.ItemisedMonster, useRegex: true);
+            FillPattern(result.Result, "flask", Category.Flask, useRegex: true);
+            FillPattern(result.Result, "gem", Category.Gem);
+            FillPattern(result.Result, "jewel", Category.Jewel, useRegex: true);
+            FillPattern(result.Result, "map", Category.Map, useRegex: true);
+            FillPattern(result.Result, "weapon", Category.Weapon, useRegex: true);
+            FillPattern(result.Result, "leaguestone", Category.Leaguestone);
+            FillPattern(result.Result, "monster", Category.ItemisedMonster, useRegex: true);
             FillPattern(result.Result, "heistequipment", Category.HeistEquipment, useRegex: true);
             FillPattern(result.Result, "heistmission", Category.Contract, useRegex: true);
             FillPattern(result.Result, "logbook", Category.Logbook, useRegex: true);
             FillPattern(result.Result, "sanctum", Category.Sanctum, useRegex: true);
             FillPattern(result.Result, "memoryline", Category.MemoryLine, useRegex: true);
-            FillPattern(result.Result, "azmeri", Category.Affliction, useRegex: true);
-            FillPattern(result.Result, "necropolis", Category.EmbersOfTheAllflame, useRegex: true);
+            FillPattern(result.Result, "tincture", Category.Tincture, useRegex: true);
+            FillPattern(result.Result, "corpse", Category.Corpse, useRegex: true);
         }
 
         private void FillPattern(List<ApiCategory> categories, string id, Category category, bool useRegex = false)

diff --git a/src/Sidekick.Apis.Poe/Metadatas/MetadataProvider.cs b/src/Sidekick.Apis.Poe/Metadatas/MetadataProvider.cs
@@ -28,82 +28,24 @@ public async Task Initialize()
 
             var result = await cacheProvider.GetOrSet("Metadata", () => poeTradeClient.Fetch<ApiCategory>("data/items"));
 
-            FillPattern(
-                result.Result,
-                "accessory",
-                Category.Accessory,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "armour",
-                Category.Armour,
-                useRegex: true);
+            FillPattern(result.Result, "accessory", Category.Accessory, useRegex: true);
+            FillPattern(result.Result, "armour", Category.Armour, useRegex: true);
             FillPattern(result.Result, "card", Category.DivinationCard);
             FillPattern(result.Result, "currency", Category.Currency);
-            FillPattern(
-                result.Result,
-                "flask",
-                Category.Flask,
-                useRegex: true);
+            FillPattern(result.Result, "flask", Category.Flask, useRegex: true);
             FillPattern(result.Result, "gem", Category.Gem);
-            FillPattern(
-                result.Result,
-                "jewel",
-                Category.Jewel,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "map",
-                Category.Map,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "weapon",
-                Category.Weapon,
-                useRegex: true);
+            FillPattern(result.Result, "jewel", Category.Jewel, useRegex: true);
+            FillPattern(result.Result, "map", Category.Map, useRegex: true);
+            FillPattern(result.Result, "weapon", Category.Weapon, useRegex: true);
             FillPattern(result.Result, "leaguestone", Category.Leaguestone);
-            FillPattern(
-                result.Result,
-                "monster",
-                Category.ItemisedMonster,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "heistequipment",
-                Category.HeistEquipment,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "heistmission",
-                Category.Contract,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "logbook",
-                Category.Logbook,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "sanctum",
-                Category.Sanctum,
-                useRegex: true);
-            FillPattern(
-                result.Result,
-                "memoryline",
-                Category.MemoryLine,
-                useRegex: true);
-
-            FillPattern(
-                result.Result,
-                "tincture",
-                Category.Tincture,
-                useRegex: true);
-
-            FillPattern(
-                result.Result,
-                "corpse",
-                Category.Corpse,
-                useRegex: true);
+            FillPattern(result.Result, "monster", Category.ItemisedMonster, useRegex: true);
+            FillPattern(result.Result, "heistequipment", Category.HeistEquipment, useRegex: true);
+            FillPattern(result.Result, "heistmission", Category.Contract, useRegex: true);
+            FillPattern(result.Result, "logbook", Category.Logbook, useRegex: true);
+            FillPattern(result.Result, "sanctum", Category.Sanctum, useRegex: true);
+            FillPattern(result.Result, "memoryline", Category.MemoryLine, useRegex: true);
+            FillPattern(result.Result, "tincture", Category.Tincture, useRegex: true);
+            FillPattern(result.Result, "corpse", Category.Corpse, useRegex: true);
 
             //FillPattern(result.Result, "azmeri", Category.Affliction, useRegex: true);
             //FillPattern(result.Result, "necropolis", Category.EmbersOfTheAllflame, useRegex: true);