Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 51 Wiki Activity

Removed own broadcast from list, count fixed as well

Browse Source
This commit is contained in:
cake
2025-12-16 00:04:57 +01:00
parent d5c11cd22f
commit 4e4d19ad00
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LightlessSync/Plugin.cs
View File

@@ -467,7 +467,8 @@ public sealed class Plugin : IDalamudPlugin
sp.GetRequiredService<ApiController>(), sp.GetRequiredService<ApiController>(),
sp.GetRequiredService<LightFinderScannerService>(), sp.GetRequiredService<LightFinderScannerService>(),
sp.GetRequiredService<PairUiService>(), sp.GetRequiredService<PairUiService>(),
sp.GetRequiredService<DalamudUtilService>())); sp.GetRequiredService<DalamudUtilService>(),
sp.GetRequiredService<LightlessProfileManager>()));
services.AddScoped<IPopupHandler, BanUserPopupHandler>(); services.AddScoped<IPopupHandler, BanUserPopupHandler>();
services.AddScoped<IPopupHandler, CensusPopupHandler>(); services.AddScoped<IPopupHandler, CensusPopupHandler>();

2
LightlessSync/Services/ContextMenuService.cs
View File

@@ -218,7 +218,7 @@ internal class ContextMenuService : IHostedService
return; 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); var receiverCid = DalamudUtilService.GetHashedCIDFromPlayerPointer(targetData.Address);
_logger.LogInformation("Sending pair request: sender {SenderCid}, receiver {ReceiverCid}", senderCid, receiverCid); _logger.LogInformation("Sending pair request: sender {SenderCid}, receiver {ReceiverCid}", senderCid, receiverCid);

5
LightlessSync/UI/SyncshellFinderUI.cs
View File

@@ -141,7 +141,8 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
return; 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)>(); var cardData = new List<(GroupJoinDto Shell, string BroadcasterName)>();
@@ -158,7 +159,7 @@ public class SyncshellFinderUI : WindowMediatorSubscriberBase
? shell.Group.Alias ? shell.Group.Alias
: shell.Group.GID; : shell.Group.GID;
broadcasterName = $"Tester of {displayName}"; broadcasterName = $"{displayName} (Tester of TestWorld)";
} }
else else
{ {

5
LightlessSync/UI/TopTabMenu.cs
View File

@@ -799,9 +799,12 @@ public class TopTabMenu
if (!_lightFinderService.IsBroadcasting) if (!_lightFinderService.IsBroadcasting)
return "Syncshell Finder"; return "Syncshell Finder";
var myHashedCid = _dalamudUtilService.GetCID().ToString().GetHash256();
var nearbyCount = _lightFinderScannerService var nearbyCount = _lightFinderScannerService
.GetActiveSyncshellBroadcasts() .GetActiveSyncshellBroadcasts()
.Where(b => !string.IsNullOrEmpty(b.GID)) .Where(b =>
!string.IsNullOrEmpty(b.GID) &&
!string.Equals(b.HashedCID, myHashedCid, StringComparison.Ordinal))
.Select(b => b.GID!) .Select(b => b.GID!)
.Distinct(StringComparer.Ordinal) .Distinct(StringComparer.Ordinal)
.Count(); .Count();