From f50b622f0a83bed685e743a618a7e3fb08d630db Mon Sep 17 00:00:00 2001 From: choco Date: Thu, 9 Oct 2025 15:50:59 +0200 Subject: [PATCH] service cleanup --- LightlessSync/PlayerData/Pairs/PairManager.cs | 7 ++----- LightlessSync/Plugin.cs | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/LightlessSync/PlayerData/Pairs/PairManager.cs b/LightlessSync/PlayerData/Pairs/PairManager.cs index 5a92649..512c7ad 100644 --- a/LightlessSync/PlayerData/Pairs/PairManager.cs +++ b/LightlessSync/PlayerData/Pairs/PairManager.cs @@ -25,7 +25,6 @@ public sealed class PairManager : DisposableMediatorSubscriberBase private readonly LightlessConfigService _configurationService; private readonly IContextMenu _dalamudContextMenu; private readonly PairFactory _pairFactory; - private readonly NotificationService _lightlessNotificationService; private Lazy> _directPairsInternal; private Lazy>> _groupPairsInternal; private Lazy>> _pairsWithGroupsInternal; @@ -36,14 +35,12 @@ public sealed class PairManager : DisposableMediatorSubscriberBase public PairManager(ILogger logger, PairFactory pairFactory, LightlessConfigService configurationService, LightlessMediator mediator, - IContextMenu dalamudContextMenu, PairProcessingLimiter pairProcessingLimiter, - NotificationService lightlessNotificationService) : base(logger, mediator) + IContextMenu dalamudContextMenu, PairProcessingLimiter pairProcessingLimiter) : base(logger, mediator) { _pairFactory = pairFactory; _configurationService = configurationService; _dalamudContextMenu = dalamudContextMenu; _pairProcessingLimiter = pairProcessingLimiter; - _lightlessNotificationService = lightlessNotificationService; Mediator.Subscribe(this, (_) => ClearPairs()); Mediator.Subscribe(this, (_) => ReapplyPairData()); _directPairsInternal = DirectPairsLazy(); @@ -171,7 +168,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase var msg = !string.IsNullOrEmpty(note) ? $"{note} ({pair.UserData.AliasOrUID}) is now online" : $"{pair.UserData.AliasOrUID} is now online"; - _lightlessNotificationService.ShowNotification("User Online", msg, NotificationType.Info, TimeSpan.FromSeconds(5)); + Mediator.Publish(new NotificationMessage("User online", msg, NotificationType.Info, TimeSpan.FromSeconds(5))); } QueuePairCreation(pair, dto); diff --git a/LightlessSync/Plugin.cs b/LightlessSync/Plugin.cs index d370dd3..862c777 100644 --- a/LightlessSync/Plugin.cs +++ b/LightlessSync/Plugin.cs @@ -145,7 +145,7 @@ public sealed class Plugin : IDalamudPlugin collection.AddSingleton((s) => new DtrEntry(s.GetRequiredService>(), dtrBar, s.GetRequiredService(), s.GetRequiredService(), s.GetRequiredService(), s.GetRequiredService(), s.GetRequiredService())); collection.AddSingleton(s => new PairManager(s.GetRequiredService>(), s.GetRequiredService(), - s.GetRequiredService(), s.GetRequiredService(), contextMenu, s.GetRequiredService(), s.GetRequiredService())); + s.GetRequiredService(), s.GetRequiredService(), contextMenu, s.GetRequiredService())); collection.AddSingleton(); collection.AddSingleton(); collection.AddSingleton(addonLifecycle);