Merge branch '2.0.2' into dev

LightlessSync/LightlessSync.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>2.0.2</Version>
+    <Version>2.0.1.69</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>

LightlessSync/UI/SettingsUi.cs

@@ -84,8 +84,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
     private bool _pairDiagnosticsEnabled;
     private string? _selectedPairDebugUid = null;
     private string _lightfinderIconInput = string.Empty;
-    private bool _showLightfinderRendererWarning = false;
-    private LightfinderLabelRenderer _pendingLightfinderRenderer = LightfinderLabelRenderer.Pictomancy;
     private bool _lightfinderIconInputInitialized = false;
     private int _lightfinderIconPresetIndex = -1;
     private static readonly LightlessConfig DefaultConfig = new();
@@ -2374,7 +2372,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 var labelRenderer = _configService.Current.LightfinderLabelRenderer;
                 var labelRendererLabel = labelRenderer switch
                 {
-                    LightfinderLabelRenderer.SignatureHook => "Native Nameplate Rendering",
+                    LightfinderLabelRenderer.SignatureHook => "Native nameplate (sig hook)",
                     _ => "ImGui Overlay",
                 };
 
@@ -2384,25 +2382,18 @@ public class SettingsUi : WindowMediatorSubscriberBase
                     {
                         var optionLabel = option switch
                         {
-                            LightfinderLabelRenderer.SignatureHook => "Native Nameplate Rendering",
+                            LightfinderLabelRenderer.SignatureHook => "Native Nameplate (sig hook)",
                             _ => "ImGui Overlay",
                         };
 
                         var selected = option == labelRenderer;
                         if (ImGui.Selectable(optionLabel, selected))
                         {
-                            if (option == LightfinderLabelRenderer.SignatureHook)
-                            {
-                                _pendingLightfinderRenderer = option;
-                                _showLightfinderRendererWarning = true;
-                            }
-                            else
-                            {
-                                _configService.Current.LightfinderLabelRenderer = option;
-                                _configService.Save();
-                                _nameplateService.RequestRedraw();
-                            }
+                            _configService.Current.LightfinderLabelRenderer = option;
+                            _configService.Save();
+                            _nameplateService.RequestRedraw();
                         }
+
                         if (selected)
                             ImGui.SetItemDefaultFocus();
                     }
@@ -2410,34 +2401,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
                     ImGui.EndCombo();
                 }
 
-                if (_showLightfinderRendererWarning)
-                {
-                    ImGui.SetNextWindowSize(new Vector2(450f, 0f), ImGuiCond.Appearing);
-                    ImGui.OpenPopup("Nameplate Warning");
-                }
-
-                if (ImGui.BeginPopupModal("Nameplate Warning", ref _showLightfinderRendererWarning, ImGuiWindowFlags.AlwaysAutoResize))
-                {
-                    ImGui.TextColored(UIColors.Get("DimRed"), "USE AT YOUR RISK!");
-                    ImGui.Spacing();
-                    ImGui.TextWrapped("Writing on to the native Nameplates is known to be unstable and MAY cause crashes. DO NOT REPORT THOSE CRASHES TO DALAMUD. We will also not be supporting Nameplate crashes. You have been warned.");
-                    ImGui.Spacing();
-                    ImGui.TextWrapped("By accepting this warning, you understand that you are using this feature at risk of crashing.");
-                    ImGui.Spacing();
-
-                    var buttonWidth = ImGui.GetContentRegionAvail().X;
-                    if (ImGui.Button("I Understand", new Vector2(buttonWidth, 0)))
-                    {
-                        _configService.Current.LightfinderLabelRenderer = _pendingLightfinderRenderer;
-                        _configService.Save();
-                        _nameplateService.RequestRedraw();
-                        _showLightfinderRendererWarning = false;
-                        ImGui.CloseCurrentPopup();
-                    }
-
-                    ImGui.EndPopup();
-                }
-
                 _uiShared.DrawHelpText("Choose how Lightfinder labels render: the default ImGui overlay or native nameplate nodes via signature hook.");
 
                 UiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"), 1.5f);

LightlessSync/UI/ZoneChatUi.cs

@@ -1000,26 +1000,23 @@ public sealed class ZoneChatUi : WindowMediatorSubscriberBase
             if (sanitized is not null)
             {
                 TrackPendingDraftClear(channel.Key, sanitized);
-                draft = string.Empty;
-                _draftMessages[channel.Key] = draft;
-                _scrollToBottom = true;
 
-                _ = Task.Run(async () =>
+                if (TrySendDraft(channel, sanitized))
                 {
-                    try
+                    _scrollToBottom = true;
+
+                    if (_draftMessages.TryGetValue(channel.Key, out var current) &&
+                        string.Equals(current, draftAtSend, StringComparison.Ordinal))
                     {
-                        var succeeded = await _zoneChatService.SendMessageAsync(channel.Descriptor, sanitized).ConfigureAwait(false);
-                        if (!succeeded)
-                        {
-                            RemovePendingDraftClear(channel.Key, sanitized);
-                        }
+                        draft = string.Empty;
+                        _draftMessages[channel.Key] = draft;
                     }
-                    catch (Exception ex)
-                    {
-                        _logger.LogWarning(ex, "Failed to send chat message");
-                        RemovePendingDraftClear(channel.Key, sanitized);
-                    }
-                });
+
+                }
+                else
+                {
+                    RemovePendingDraftClear(channel.Key, sanitized);
+                }
             }
         }
     }