From 4e4d19ad007a06e5fcb9531f8ed1d00a4db2ee5d Mon Sep 17 00:00:00 2001
From: cake <admin@cakeandbanana.nl>
Date: Tue, 16 Dec 2025 00:04:57 +0100
Subject: [PATCH] Removed own broadcast from list, count fixed as well

---
 LightlessSync/Plugin.cs                      | 3 ++-
 LightlessSync/Services/ContextMenuService.cs | 2 +-
 LightlessSync/UI/SyncshellFinderUI.cs        | 5 +++--
 LightlessSync/UI/TopTabMenu.cs               | 5 ++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/LightlessSync/Plugin.cs b/LightlessSync/Plugin.cs
index 2cf8bdf..d8e5ee7 100644
--- a/LightlessSync/Plugin.cs
+++ b/LightlessSync/Plugin.cs
@@ -467,7 +467,8 @@ public sealed class Plugin : IDalamudPlugin
             sp.GetRequiredService<ApiController>(),
             sp.GetRequiredService<LightFinderScannerService>(),
             sp.GetRequiredService<PairUiService>(),
-            sp.GetRequiredService<DalamudUtilService>()));
+            sp.GetRequiredService<DalamudUtilService>(),
+            sp.GetRequiredService<LightlessProfileManager>()));
 
         services.AddScoped<IPopupHandler, BanUserPopupHandler>();
         services.AddScoped<IPopupHandler, CensusPopupHandler>();
diff --git a/LightlessSync/Services/ContextMenuService.cs b/LightlessSync/Services/ContextMenuService.cs
index 740f52b..53bbb45 100644
--- a/LightlessSync/Services/ContextMenuService.cs
+++ b/LightlessSync/Services/ContextMenuService.cs
@@ -218,7 +218,7 @@ internal class ContextMenuService : IHostedService
                 return;
             }
 
-            var senderCid = (await _dalamudUtil.GetCIDAsync().ConfigureAwait(false)).ToString().GetBlake3Hash();
+            var senderCid = (await _dalamudUtil.GetCIDAsync().ConfigureAwait(false)).ToString().GetHash256();
             var receiverCid = DalamudUtilService.GetHashedCIDFromPlayerPointer(targetData.Address);
 
             _logger.LogInformation("Sending pair request: sender {SenderCid}, receiver {ReceiverCid}", senderCid, receiverCid);
diff --git a/LightlessSync/UI/SyncshellFinderUI.cs b/LightlessSync/UI/SyncshellFinderUI.cs
index 00a008f..64f7921 100644
--- a/LightlessSync/UI/SyncshellFinderUI.cs
+++ b/LightlessSync/UI/SyncshellFinderUI.cs
@@ -141,7 +141,8 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
             return;
         }
 
-        var broadcasts = _broadcastScannerService.GetActiveSyncshellBroadcasts() ?? [];
+        var myHashedCid = _dalamudUtilService.GetCID().ToString().GetHash256();
+        var broadcasts = _broadcastScannerService.GetActiveSyncshellBroadcasts().Where(b => !string.Equals(b.HashedCID, myHashedCid, StringComparison.Ordinal)).ToList() ?? [];
 
         var cardData = new List<(GroupJoinDto Shell, string BroadcasterName)>();
 
@@ -158,7 +159,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
                     ? shell.Group.Alias
                     : shell.Group.GID;
 
-                broadcasterName = $"Tester of {displayName}";
+                broadcasterName = $"{displayName} (Tester of TestWorld)";
             }
             else
             {
diff --git a/LightlessSync/UI/TopTabMenu.cs b/LightlessSync/UI/TopTabMenu.cs
index 16f3ea0..471fc11 100644
--- a/LightlessSync/UI/TopTabMenu.cs
+++ b/LightlessSync/UI/TopTabMenu.cs
@@ -799,9 +799,12 @@ public class TopTabMenu
         if (!_lightFinderService.IsBroadcasting)
             return "Syncshell Finder";
 
+        var myHashedCid = _dalamudUtilService.GetCID().ToString().GetHash256();
         var nearbyCount = _lightFinderScannerService
             .GetActiveSyncshellBroadcasts()
-            .Where(b => !string.IsNullOrEmpty(b.GID))
+            .Where(b =>
+                !string.IsNullOrEmpty(b.GID) &&
+                !string.Equals(b.HashedCID, myHashedCid, StringComparison.Ordinal))
             .Select(b => b.GID!)
             .Distinct(StringComparer.Ordinal)
             .Count();