Merge pull request 'Fixed amount of lightfinder users, added user names in the server info list for lightfinder. Added /lightless command' (#75) from lightfinder-dtr-changes into 1.12.4

Reviewed-on: #75
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>
Reviewed-by: choco <choco@noreply.git.lightless-sync.org>

LightlessSync/UI/DtrEntry.cs

@@ -2,19 +2,22 @@ using Dalamud.Game.Gui.Dtr;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Plugin.Services;
+using Dalamud.Utility;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Configurations;
 using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services;
 using LightlessSync.Services.Mediator;
 using LightlessSync.Services.ServerConfiguration;
+using LightlessSync.Utils;
 using LightlessSync.WebAPI;
 using LightlessSync.WebAPI.SignalR.Utils;
-using LightlessSync.Utils;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
 using System.Runtime.InteropServices;
 using System.Text;
+using static LightlessSync.Services.PairRequestService;
 
 namespace LightlessSync.UI;
 
@@ -106,7 +109,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
         }
         catch (OperationCanceledException)
         {
-
+            _logger.LogInformation("Lightfinder operation was canceled.");
         }
         finally
         {
@@ -363,29 +366,46 @@ public sealed class DtrEntry : IDisposable, IHostedService
         }
     }
 
-    private int GetNearbyBroadcastCount()
-    {
-        var localHashedCid = GetLocalHashedCid();
-        return _broadcastScannerService.CountActiveBroadcasts(
-            string.IsNullOrEmpty(localHashedCid) ? null : localHashedCid);
-    }
-
-    private int GetPendingPairRequestCount()
+    private List<string> GetNearbyBroadcasts()
     {
         try
         {
-            return _pairRequestService.GetActiveRequests().Count;
+            var localHashedCid = GetLocalHashedCid();
+            return [.. _broadcastScannerService
+                .GetActiveBroadcasts(string.IsNullOrEmpty(localHashedCid) ? null : localHashedCid)
+                .Select(b => _dalamudUtilService.FindPlayerByNameHash(b.Key).Name)];
         }
         catch (Exception ex)
         {
             var now = DateTime.UtcNow;
+
+            if (now >= _pairRequestNextErrorLog)
+            {
+                _logger.LogDebug(ex, "Failed to retrieve nearby broadcasts for Lightfinder DTR entry.");
+                _pairRequestNextErrorLog = now + _localHashedCidErrorCooldown;
+            }
+
+            return [];
+        }
+    }
+
+    private IReadOnlyList<PairRequestDisplay> GetPendingPairRequest()
+    {
+        try
+        {
+            return _pairRequestService.GetActiveRequests();
+        }
+        catch (Exception ex)
+        {
+            var now = DateTime.UtcNow;
+
             if (now >= _pairRequestNextErrorLog)
             {
                 _logger.LogDebug(ex, "Failed to retrieve pair request count for Lightfinder DTR entry.");
                 _pairRequestNextErrorLog = now + _localHashedCidErrorCooldown;
             }
 
-            return 0;
+            return [];
         }
     }
 
@@ -400,23 +420,15 @@ public sealed class DtrEntry : IDisposable, IHostedService
 
         if (_broadcastService.IsBroadcasting)
         {
-            var tooltipBuilder = new StringBuilder("Lightfinder - Enabled");
-
             switch (config.LightfinderDtrDisplayMode)
             {
                 case LightfinderDtrDisplayMode.PendingPairRequests:
                 {
-                    var requestCount = GetPendingPairRequestCount();
-                    tooltipBuilder.AppendLine();
-                    tooltipBuilder.Append("Pending pair requests: ").Append(requestCount);
-                    return ($"{icon} Requests {requestCount}", SwapColorChannels(config.DtrColorsLightfinderEnabled), tooltipBuilder.ToString());
+                    return FormatTooltip("Pending pair requests", GetPendingPairRequest().Select(x => x.DisplayName), icon, SwapColorChannels(config.DtrColorsLightfinderEnabled));
                 }
                 default:
                 {
-                    var broadcastCount = GetNearbyBroadcastCount();
-                    tooltipBuilder.AppendLine();
-                    tooltipBuilder.Append("Nearby Lightfinder users: ").Append(broadcastCount);
-                    return ($"{icon} {broadcastCount}", SwapColorChannels(config.DtrColorsLightfinderEnabled), tooltipBuilder.ToString());
+                    return FormatTooltip("Nearby Lightfinder users", GetNearbyBroadcasts(), icon, SwapColorChannels(config.DtrColorsLightfinderEnabled));
                 }
             }
         }
@@ -433,6 +445,18 @@ public sealed class DtrEntry : IDisposable, IHostedService
         return ($"{icon} OFF", colors, tooltip.ToString());
     }
 
+    private (string, Colors, string) FormatTooltip(string title, IEnumerable<string> names, string icon, Colors color)
+    {
+        var list = names.Where(x => !string.IsNullOrEmpty(x)).ToList();
+        var tooltip = new StringBuilder()
+            .Append($"Lightfinder - Enabled{Environment.NewLine}")
+            .Append($"{title}: {list.Count}{Environment.NewLine}")
+            .AppendJoin(Environment.NewLine, list)
+            .ToString();
+
+        return ($"{icon} {list.Count}", color, tooltip);
+    }
+
     private static string BuildLightfinderTooltip(string baseTooltip)
     {
         var builder = new StringBuilder();