fix(v0.5.0): pre-release polish from full-codebase review

- Plugin.cs: mark RetentionSweepRunning volatile so the ImGui thread
  reads the latest value without a stale register-cached copy
- EmoteCache.cs: reset State to Unloaded on exception so a later
  trigger can retry instead of being blocked by the early-out
- Settings.cs: switch the SaveAndClose / Discard buttons to Allman
  bracing for consistency with the rest of the file, and include the
  ItemSpacing in the Ko-fi-button right-edge calculation
- Privacy.cs: add a saved-policy hint above the manual retention
  Ctrl+Shift button so the existing Cleanup wording pattern is
  matched here too
- HellionStrings: drop seven unreferenced keys (Theme_Heading,
  Migration_Notification_*, Migration_Webinterface_Removed_*,
  AutoTellTabs_Migration_*) and their EN/DE values, add the new
  Retention_Help_SavedNote string

ChatTwo/EmoteCache.cs

@@ -105,6 +105,11 @@ public static class EmoteCache
         }
         catch (Exception ex)
         {
+            // Reset to Unloaded so a later trigger (e.g. the user reopening
+            // the Emotes tab after the network recovers) can retry. Without
+            // this the State stays on Loading and the early-out at the top
+            // of LoadData blocks every further attempt until plugin reload.
+            State = LoadingState.Unloaded;
             Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
         }
     }

ChatTwo/Plugin.cs

@@ -72,8 +72,11 @@ public sealed class Plugin : IDalamudPlugin
     // plugin start would launch two sweeps in parallel and the second one
     // would just re-do work the first one already finished. The lock guards
     // the flag — the flag check itself bails before we touch the database.
+    // Volatile because the ImGui thread reads the flag outside the lock to
+    // gate the manual button; without it the JIT may cache the value in a
+    // register and miss the background-thread update.
     internal readonly object RetentionSweepLock = new();
-    internal bool RetentionSweepRunning;
+    internal volatile bool RetentionSweepRunning;
 
     internal DateTime GameStarted { get; }
 

ChatTwo/Resources/HellionStrings.Designer.cs

@@ -64,6 +64,7 @@ internal class HellionStrings
     internal static string Cleanup_Heading => Get(nameof(Cleanup_Heading));
     internal static string Cleanup_Help_Intro => Get(nameof(Cleanup_Help_Intro));
     internal static string Cleanup_Help_SavedNote => Get(nameof(Cleanup_Help_SavedNote));
+    internal static string Retention_Help_SavedNote => Get(nameof(Retention_Help_SavedNote));
     internal static string Cleanup_RefreshPreview => Get(nameof(Cleanup_RefreshPreview));
     internal static string Cleanup_NoPreview => Get(nameof(Cleanup_NoPreview));
     internal static string Cleanup_TotalStored => Get(nameof(Cleanup_TotalStored));
@@ -99,11 +100,6 @@ internal class HellionStrings
     internal static string Retention_Success => Get(nameof(Retention_Success));
     internal static string Retention_Error => Get(nameof(Retention_Error));
 
-    internal static string Migration_Notification_Title => Get(nameof(Migration_Notification_Title));
-    internal static string Migration_Notification_Content => Get(nameof(Migration_Notification_Content));
-    internal static string Migration_Webinterface_Removed_Title => Get(nameof(Migration_Webinterface_Removed_Title));
-    internal static string Migration_Webinterface_Removed_Content => Get(nameof(Migration_Webinterface_Removed_Content));
-
     internal static string Wizard_Title => Get(nameof(Wizard_Title));
     internal static string Wizard_Intro => Get(nameof(Wizard_Intro));
     internal static string Wizard_Profile_PrivacyFirst_Heading => Get(nameof(Wizard_Profile_PrivacyFirst_Heading));
@@ -135,7 +131,6 @@ internal class HellionStrings
     internal static string Export_Empty => Get(nameof(Export_Empty));
     internal static string Export_Error => Get(nameof(Export_Error));
 
-    internal static string Theme_Heading => Get(nameof(Theme_Heading));
     internal static string Theme_Enabled_Name => Get(nameof(Theme_Enabled_Name));
     internal static string Theme_Enabled_Description => Get(nameof(Theme_Enabled_Description));
     internal static string Theme_WindowOpacity_Label => Get(nameof(Theme_WindowOpacity_Label));
@@ -167,8 +162,6 @@ internal class HellionStrings
     internal static string About_Translators_TreeNode => Get(nameof(About_Translators_TreeNode));
 
     // Hellion Chat — Auto-Tell-Tabs runtime strings
-    internal static string AutoTellTabs_Migration_Title => Get(nameof(AutoTellTabs_Migration_Title));
-    internal static string AutoTellTabs_Migration_Content => Get(nameof(AutoTellTabs_Migration_Content));
     internal static string AutoTellTabs_SectionHeader => Get(nameof(AutoTellTabs_SectionHeader));
     internal static string AutoTellTabs_HistorySeparator => Get(nameof(AutoTellTabs_HistorySeparator));
     internal static string AutoTellTabs_HistoryLoadError => Get(nameof(AutoTellTabs_HistoryLoadError));

ChatTwo/Resources/HellionStrings.de.resx

@@ -78,6 +78,9 @@
   <data name="Cleanup_Help_SavedNote" xml:space="preserve">
     <value>Das Aufräumen nutzt deine GESPEICHERTE Whitelist (Plugin.Config), nicht ungespeicherte Änderungen oben. Klicke zuerst Speichern, wenn du deine aktuellen Änderungen anwenden willst.</value>
   </data>
+  <data name="Retention_Help_SavedNote" xml:space="preserve">
+    <value>Der manuelle Lauf nutzt deine GESPEICHERTE Retention-Policy, nicht die Slider-Werte oben. Klicke zuerst Speichern, wenn der Lauf deine aktuellen Änderungen anwenden soll.</value>
+  </data>
   <data name="Cleanup_RefreshPreview" xml:space="preserve">
     <value>Vorschau aktualisieren</value>
   </data>
@@ -177,18 +180,6 @@
   <data name="Retention_Error" xml:space="preserve">
     <value>Aufbewahrungs-Bereinigung fehlgeschlagen, siehe /xllog</value>
   </data>
-  <data name="Migration_Notification_Title" xml:space="preserve">
-    <value>Hellion Chat</value>
-  </data>
-  <data name="Migration_Notification_Content" xml:space="preserve">
-    <value>Datenschutz-Filter ist standardmäßig aktiviert. Einstellungen → Datenschutz zum Anpassen.</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Title" xml:space="preserve">
-    <value>Hellion Chat 0.2.0</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Content" xml:space="preserve">
-    <value>Das Webinterface wurde in dieser Version entfernt, weil es nicht auf das Datenschutz-Niveau gehärtet werden konnte das Hellion Chat standardmäßig zusichert. Falls du es genutzt hast, schau bitte in die README für Hintergründe.</value>
-  </data>
   <data name="Wizard_Title" xml:space="preserve">
     <value>Hellion Chat — Willkommen</value>
   </data>
@@ -276,9 +267,6 @@
   <data name="Export_Error" xml:space="preserve">
     <value>Export fehlgeschlagen, siehe /xllog</value>
   </data>
-  <data name="Theme_Heading" xml:space="preserve">
-    <value>Erscheinungsbild</value>
-  </data>
   <data name="Theme_Enabled_Name" xml:space="preserve">
     <value>Hellion-Theme für alle Plugin-Fenster verwenden</value>
   </data>
@@ -371,12 +359,6 @@
   </data>
 
   <!-- Hellion Chat — Auto-Tell-Tabs (Runtime-Strings) -->
-  <data name="AutoTellTabs_Migration_Title" xml:space="preserve">
-    <value>Auto-Tell-Tabs</value>
-  </data>
-  <data name="AutoTellTabs_Migration_Content" xml:space="preserve">
-    <value>Auto-Tell-Tabs sind ab Version 0.4.0 standardmäßig aktiv. Du kannst sie im Chat-Tab deaktivieren oder anpassen.</value>
-  </data>
   <data name="AutoTellTabs_SectionHeader" xml:space="preserve">
     <value>Aktive Tells</value>
   </data>

ChatTwo/Resources/HellionStrings.resx

@@ -78,6 +78,9 @@
   <data name="Cleanup_Help_SavedNote" xml:space="preserve">
     <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved edits above. Click Save first if you want to apply your current edits.</value>
   </data>
+  <data name="Retention_Help_SavedNote" xml:space="preserve">
+    <value>The manual sweep uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current edits.</value>
+  </data>
   <data name="Cleanup_RefreshPreview" xml:space="preserve">
     <value>Refresh preview</value>
   </data>
@@ -177,18 +180,6 @@
   <data name="Retention_Error" xml:space="preserve">
     <value>Retention sweep failed, see /xllog</value>
   </data>
-  <data name="Migration_Notification_Title" xml:space="preserve">
-    <value>Hellion Chat</value>
-  </data>
-  <data name="Migration_Notification_Content" xml:space="preserve">
-    <value>Privacy filter activated by default. Settings → Privacy to adjust.</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Title" xml:space="preserve">
-    <value>Hellion Chat 0.2.0</value>
-  </data>
-  <data name="Migration_Webinterface_Removed_Content" xml:space="preserve">
-    <value>The webinterface has been removed in this version because it could not be hardened to the privacy guarantees Hellion Chat makes by default. If you used it, please consult the README for context.</value>
-  </data>
   <data name="Wizard_Title" xml:space="preserve">
     <value>Hellion Chat — Welcome</value>
   </data>
@@ -276,9 +267,6 @@
   <data name="Export_Error" xml:space="preserve">
     <value>Export failed, see /xllog</value>
   </data>
-  <data name="Theme_Heading" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
   <data name="Theme_Enabled_Name" xml:space="preserve">
     <value>Use the Hellion theme across all plugin windows</value>
   </data>
@@ -371,12 +359,6 @@
   </data>
 
   <!-- Hellion Chat — Auto-Tell-Tabs (runtime strings) -->
-  <data name="AutoTellTabs_Migration_Title" xml:space="preserve">
-    <value>Auto-Tell-Tabs</value>
-  </data>
-  <data name="AutoTellTabs_Migration_Content" xml:space="preserve">
-    <value>Auto-Tell-Tabs are enabled by default starting with version 0.4.0. You can disable or fine-tune them in the Chat tab.</value>
-  </data>
   <data name="AutoTellTabs_SectionHeader" xml:space="preserve">
     <value>Active Tells</value>
   </data>

ChatTwo/Ui/Settings.cs

@@ -110,14 +110,16 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
 
         ImGui.SameLine();
 
-        if (ImGui.Button(Language.Settings_SaveAndClose)) {
+        if (ImGui.Button(Language.Settings_SaveAndClose))
+        {
             save = true;
             IsOpen = false;
         }
 
         ImGui.SameLine();
 
-        if (ImGui.Button(Language.Settings_Discard)) {
+        if (ImGui.Button(Language.Settings_Discard))
+        {
             IsOpen = false;
         }
 
@@ -131,7 +133,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
         {
             var buttonWidth = ImGui.CalcTextSize(buttonLabel).X + ImGui.GetStyle().FramePadding.X * 2;
             var buttonWidth2 = ImGui.CalcTextSize(buttonLabel2).X + ImGui.GetStyle().FramePadding.X * 2;
-            ImGui.SameLine(ImGui.GetContentRegionAvail().X - buttonWidth - buttonWidth2);
+            ImGui.SameLine(ImGui.GetContentRegionAvail().X - buttonWidth - buttonWidth2 - ImGui.GetStyle().ItemSpacing.X);
 
             if (ImGui.Button(buttonLabel2))
                 Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii");

ChatTwo/Ui/SettingsTabs/Privacy.cs

@@ -403,6 +403,9 @@ internal sealed class Privacy : ISettingsTab
 
                 ImGui.Spacing();
 
+                ImGuiUtil.HelpText(HellionStrings.Retention_Help_SavedNote);
+                ImGui.Spacing();
+
                 using (ImRaii.Disabled(RetentionRunning))
                 {
                     if (ImGuiUtil.CtrlShiftButton(HellionStrings.Retention_Apply_Label, HellionStrings.Retention_Apply_Tooltip))