Adapt rarity colors and refetch Public API data after language change

source/Helpers/Input/EventsHandler.cs

@@ -83,7 +83,7 @@ private static async void TriggerItemFetch()
         {
             Logger.Log("Hotkey for pricing item triggered.");
 
-            Item item = TriggerCopyAction();
+            Item item = await TriggerCopyAction();
             if (item != null)
             {
                 OverlayController.Open();
@@ -100,11 +100,11 @@ private static async void TriggerItemFetch()
             OverlayController.Hide();
         }
 
-        private static void TriggerItemWiki()
+        private static async void TriggerItemWiki()
         {
             Logger.Log("Hotkey for opening wiki triggered.");
 
-            var item = TriggerCopyAction();
+            var item = await TriggerCopyAction();
             if (item != null)
             {
                 POEWikiAPI.POEWikiHelper.Open(item);
@@ -126,7 +126,7 @@ private static void ExitApplication()
             Application.Exit();
         }
 
-        private static Item TriggerCopyAction()
+        private static async Task<Item> TriggerCopyAction()
         {
             // Trigger copy action.
             SendKeys.SendWait(Input.KeyCommands.COPY);
@@ -136,7 +136,8 @@ private static Item TriggerCopyAction()
             var itemText = ClipboardHelper.GetText();
 
             // Detect the language of the item in the clipboard.
-            if (!LanguageSettings.FindAndSetLanguageProvider(itemText))
+            var setLanguageSuccess = await LanguageSettings.FindAndSetLanguageProvider(itemText);
+            if (!setLanguageSuccess)
             {
                 return null;
             }

source/Helpers/Localization/LanguageSettings.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using Sidekick.Helpers.POETradeAPI;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Sidekick.Helpers.Localization
 {
@@ -33,8 +35,9 @@ public static class LanguageSettings
 
         /// <summary>
         /// Every item should start with Rarity in the first line. 
+        /// This will force the TradeClient to refetch the Public API's data if needed.
         /// </summary>
-        public static bool FindAndSetLanguageProvider(string itemDescription)
+        public static async Task<bool> FindAndSetLanguageProvider(string itemDescription)
         {
             foreach (var item in RarityToLanguageDictionary)
             {
@@ -45,6 +48,8 @@ public static bool FindAndSetLanguageProvider(string itemDescription)
                         Logger.Log($"Changed language support to {item.Value}.");
                         CurrentLanguage = item.Value;
                         Provider = GetLanguageProvider(item.Value);
+                        TradeClient.Dispose();
+                        return await TradeClient.Initialize();
                     }
 
                     return true;

source/Helpers/POETradeAPI/Models/QueryRequest.cs

@@ -56,11 +56,6 @@ public QueryRequest(Item item)
                         };
                     }
 
-                    Query.Filters.TypeFilter.Filters.Rarity = new FilterOption()
-                    {
-                        Option = ((EquippableItem)item).Rarity.ToLowerInvariant(),
-                    };
-
                     switch (((EquippableItem)item).Influence)
                     {
                         case InfluenceType.None:

source/Helpers/POETradeAPI/TradeClient.cs

@@ -30,7 +30,7 @@ public static class TradeClient
 
         public static League SelectedLeague;
 
-        public static async void Initialize()
+        public static async Task<bool> Initialize()
         {
             if (_jsonSerializerSettings == null)
             {
@@ -42,7 +42,7 @@ public static async void Initialize()
 
             if (IsFetching)
             {
-                return;
+                return false;
             }
 
             IsFetching = true;
@@ -57,7 +57,7 @@ public static async void Initialize()
                 Logger.Log("Retrying every minute.");
                 Dispose();
                 await Task.Run(Retry);
-                return;
+                return false;
             }
 
             IsFetching = false;
@@ -69,6 +69,8 @@ public static async void Initialize()
             Logger.Log($"Path of Exile trade data fetched.");
             Logger.Log($"Sidekick is ready, press Ctrl+D over an item in-game to use. Press Escape to close overlay.");
             TrayIcon.SendNotification("Press Ctrl+D over an item in-game to use. Press Escape to close overlay.", "Sidekick is ready");
+
+            return true;
         }
 
         private static async void Retry()
@@ -81,7 +83,7 @@ private static async void Retry()
             }
             else
             {
-                Initialize();
+                await Initialize();
             }
         }
 

source/Helpers/TrayIcon.cs

@@ -31,15 +31,22 @@ public static void Initialize()
 
         public static void PopulateLeagueSelectMenu(List<League> leagues)
         {
-            foreach (League l in leagues)
+            if(_leagueSelectMenu.DropDownItems.Count > 0)
             {
-                var menuItem = new ToolStripMenuItem(l.Id);
-                menuItem.Click += (s, e) => { foreach (ToolStripMenuItem t in _leagueSelectMenu.DropDownItems) { t.Checked = false; } };
+                // TODO: Fix Cross-thread operation not valid after changing language.
+                return;
+            }
+
+            foreach (var league in leagues)
+            {
+                var menuItem = new ToolStripMenuItem(league.Id);
+                menuItem.Click += (s, e) => { foreach (ToolStripMenuItem x in _leagueSelectMenu.DropDownItems) { x.Checked = false; } };
                 menuItem.Click += (s, e) => { menuItem.Checked = true; };
-                menuItem.Click += (s, e) => { TradeClient.SelectedLeague = l; };
+                menuItem.Click += (s, e) => { TradeClient.SelectedLeague = league; };
                 _leagueSelectMenu.DropDownItems.Add(menuItem);
             }
-            //select the first league as the default
+
+            // Select the first league as the default.
             _leagueSelectMenu.DropDownItems[0].PerformClick();
         }
 

source/Program.cs

@@ -25,7 +25,7 @@ static void Main()
             TrayIcon.Initialize();
 
             // Load POE Trade information.
-            TradeClient.Initialize();
+            _ = TradeClient.Initialize();
 
             // Keyboard hooks.
             EventsHandler.Initialize();

source/Windows/Overlay/Converters/RarityToColorConverter.cs

@@ -1,4 +1,5 @@
-using System;
+using Sidekick.Helpers.Localization;
+using System;
 using System.Globalization;
 using System.Windows.Data;
 using System.Windows.Media;
@@ -9,20 +10,25 @@ public class RarityToColorConverter : IValueConverter
     {
         private Color GetRarityColor(string rarity)
         {
-            switch (rarity)
+            if (rarity == LanguageSettings.Provider.RarityNormal)
             {
-                case "Normal":
-                    return Color.FromRgb(200, 200, 200);
-                case "Magic":
-                    return Color.FromRgb(136, 136, 255);
-                case "Rare":
-                    return Color.FromRgb(255, 255, 119);
-                case "Unique":
-                    return Color.FromRgb(175, 96, 37);
-                default:
-                    //gem, currency, divination card, quest item, prophecy, relic
-                    return Color.FromRgb(170, 158, 130);
+                return Color.FromRgb(200, 200, 200);
             }
+            if (rarity == LanguageSettings.Provider.RarityMagic)
+            {
+                return Color.FromRgb(136, 136, 255);
+            }
+            if (rarity == LanguageSettings.Provider.RarityRare)
+            {
+                return Color.FromRgb(255, 255, 119);
+            }
+            if (rarity == LanguageSettings.Provider.RarityUnique)
+            {
+                return Color.FromRgb(175, 96, 37);
+            }
+
+            // Gem, Currency, Divination Card, Quest Item, Prophecy, Relic, etc.
+            return Color.FromRgb(170, 158, 130);
         }
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)