Add Serious Warning about nameplates

LightlessSync/LightlessSync.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>2.0.3</Version>
+    <Version>2.0.2</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>
@@ -37,7 +37,6 @@
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
     <PackageReference Include="Glamourer.Api" Version="2.8.0" />
     <PackageReference Include="NReco.Logging.File" Version="1.3.1" />

LightlessSync/PlayerData/Pairs/PairHandlerAdapter.cs

@@ -1423,7 +1423,7 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
     private Task _visibilityGraceTask;
 
     private async Task DownloadAndApplyCharacterAsync(Guid applicationBase, CharacterData charaData, Dictionary<ObjectKind, HashSet<PlayerChanges>> updatedData,
-     bool updateModdedPaths, bool updateManip, Dictionary<(string GamePath, string? Hash), string>? cachedModdedPaths, CancellationToken downloadToken)
+        bool updateModdedPaths, bool updateManip, Dictionary<(string GamePath, string? Hash), string>? cachedModdedPaths, CancellationToken downloadToken)
     {
         var concurrencyLease = await _pairProcessingLimiter.AcquireAsync(downloadToken).ConfigureAwait(false);
         try
@@ -1577,37 +1577,24 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
                 RecordFailure("Handler not available for application", "HandlerUnavailable");
                 return;
             }
-            _applicationCancellationTokenSource = _applicationCancellationTokenSource.CancelRecreate() ?? new CancellationTokenSource();
 
-            if (_applicationTask != null && !_applicationTask.IsCompleted)
+            var appToken = _applicationCancellationTokenSource?.Token;
+            while ((!_applicationTask?.IsCompleted ?? false)
+                   && !downloadToken.IsCancellationRequested
+                   && (!appToken?.IsCancellationRequested ?? false))
             {
-                Logger.LogDebug("[BASE-{appBase}] Cancelling current data application (Id: {id}) for player ({handler})", applicationBase, _applicationId, PlayerName);
+                Logger.LogDebug("[BASE-{appBase}] Waiting for current data application (Id: {id}) for player ({handler}) to finish", applicationBase, _applicationId, PlayerName);
-
+                await Task.Delay(250).ConfigureAwait(false);
-                var timeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-                var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(downloadToken, timeoutCts.Token);
-
-                try
-                {
-                    await _applicationTask.WaitAsync(combinedCts.Token).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    Logger.LogWarning("[BASE-{appBase}] Timeout waiting for application task {id} to complete, proceeding anyway", applicationBase, _applicationId);
-                }
-                finally
-                {
-                    timeoutCts.Dispose();
-                    combinedCts.Dispose();
-                }
             }
 
-            if (downloadToken.IsCancellationRequested)
+            if (downloadToken.IsCancellationRequested || (appToken?.IsCancellationRequested ?? false))
             {
                 _forceFullReapply = true;
                 RecordFailure("Application cancelled", "Cancellation");
                 return;
             }
 
+            _applicationCancellationTokenSource = _applicationCancellationTokenSource.CancelRecreate() ?? new CancellationTokenSource();
             var token = _applicationCancellationTokenSource.Token;
 
             _applicationTask = ApplyCharacterDataAsync(applicationBase, handlerForApply, charaData, updatedData, updateModdedPaths, updateManip, moddedPaths, wantsModApply, pendingModReapply, token);

LightlessSync/Plugin.cs

@@ -140,7 +140,6 @@ public sealed class Plugin : IDalamudPlugin
         services.AddSingleton<IdDisplayHandler>();
         services.AddSingleton<PlayerPerformanceService>();
         services.AddSingleton<PenumbraTempCollectionJanitor>();
-        services.AddSingleton<LocationShareService>();
 
         services.AddSingleton<TextureMetadataHelper>(sp =>
             new TextureMetadataHelper(sp.GetRequiredService<ILogger<TextureMetadataHelper>>(), gameData));

LightlessSync/Services/ContextMenuService.cs

@@ -10,6 +10,7 @@ using LightlessSync.UI;
 using LightlessSync.UI.Services;
 using LightlessSync.Utils;
 using LightlessSync.WebAPI;
+using Lumina.Excel.Sheets;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
@@ -171,8 +172,9 @@ internal class ContextMenuService : IHostedService
             _logger.LogTrace("Cannot send pair request to {TargetName}@{World} while in PvP or GPose.", target.TargetName, target.TargetHomeWorld.RowId);
             return;
         }
-        
+
-        if (!IsWorldValid(target.TargetHomeWorld.RowId))
+        var world = GetWorld(target.TargetHomeWorld.RowId);
+        if (!IsWorldValid(world))
         {
             _logger.LogTrace("Target player {TargetName}@{World} is on an invalid world.", target.TargetName, target.TargetHomeWorld.RowId);
             return;
@@ -224,8 +226,9 @@ internal class ContextMenuService : IHostedService
     {
         if (args.Target is not MenuTargetDefault target)
             return;
-        
+
-        if (!target.TargetHomeWorld.IsValid || !IsWorldValid(target.TargetHomeWorld.RowId))
+        var world = GetWorld(target.TargetHomeWorld.RowId);
+        if (!IsWorldValid(world))
             return;
 
         try
@@ -234,7 +237,7 @@ internal class ContextMenuService : IHostedService
 
             if (targetData == null || targetData.Address == nint.Zero)
             {
-                _logger.LogWarning("Target player {TargetName}@{World} not found in object table.", target.TargetName, target.TargetHomeWorld.Value.Name);
+                _logger.LogWarning("Target player {TargetName}@{World} not found in object table.", target.TargetName, world.Name);
                 return;
             }
 
@@ -249,7 +252,7 @@ internal class ContextMenuService : IHostedService
             }
 
             // Notify in chat when NotificationService is disabled
-            NotifyInChat($"Pair request sent to {target.TargetName}@{target.TargetHomeWorld.Value.Name}.", NotificationType.Info);
+            NotifyInChat($"Pair request sent to {target.TargetName}@{world.Name}.", NotificationType.Info);
         }
         catch (Exception ex)
         {
@@ -309,8 +312,37 @@ internal class ContextMenuService : IHostedService
                 p.HomeWorld.RowId == target.TargetHomeWorld.RowId);
     }
 
-    private bool IsWorldValid(uint worldId)
+    private World GetWorld(uint worldId)
     {
-        return _dalamudUtil.WorldData.Value.ContainsKey((ushort)worldId);
+        var sheet = _gameData.GetExcelSheet<World>()!;
+        var luminaWorlds = sheet.Where(x =>
+        {
+            var dc = x.DataCenter.ValueNullable;
+            var name = x.Name.ExtractText();
+            var internalName = x.InternalName.ExtractText();
+
+            if (dc == null || dc.Value.Region == 0 || string.IsNullOrWhiteSpace(dc.Value.Name.ExtractText()))
+                return false;
+
+            if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(internalName))
+                return false;
+
+            if (name.Contains('-', StringComparison.Ordinal) || name.Contains('_', StringComparison.Ordinal))
+                return false;
+
+            return x.DataCenter.Value.Region != 5 || x.RowId > 3001 && x.RowId != 1200 && IsChineseJapaneseKoreanString(name);
+        });
+
+        return luminaWorlds.FirstOrDefault(x => x.RowId == worldId);
+    }
+
+    private static bool IsChineseJapaneseKoreanString(string text) => text.All(IsChineseJapaneseKoreanCharacter);
+
+    private static bool IsChineseJapaneseKoreanCharacter(char c) => c >= 0x4E00 && c <= 0x9FFF;
+
+    public static bool IsWorldValid(World world)
+    {
+        var name = world.Name.ToString();
+        return !string.IsNullOrWhiteSpace(name) && char.IsUpper(name[0]);
     }
 }

LightlessSync/Services/DalamudUtilService.cs

@@ -1,13 +1,11 @@
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Game.Text;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Control;
-using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using LightlessSync.API.Dto.CharaData;
@@ -28,7 +26,6 @@ using System.Text;
 using BattleNpcSubKind = FFXIVClientStructs.FFXIV.Client.Game.Object.BattleNpcSubKind;
 using DalamudObjectKind = Dalamud.Game.ClientState.Objects.Enums.ObjectKind;
 using GameObject = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject;
-using Map = Lumina.Excel.Sheets.Map;
 using VisibilityFlags = FFXIVClientStructs.FFXIV.Client.Game.Object.VisibilityFlags;
 
 namespace LightlessSync.Services;
@@ -60,7 +57,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private string _lastGlobalBlockReason = string.Empty;
     private ushort _lastZone = 0;
     private ushort _lastWorldId = 0;
-    private uint _lastMapId = 0;
     private bool _sentBetweenAreas = false;
     private Lazy<ulong> _cid;
 
@@ -90,8 +86,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         WorldData = new(() =>
         {
             return gameData.GetExcelSheet<Lumina.Excel.Sheets.World>(clientLanguage)!
-                .Where(w => !w.Name.IsEmpty && w.DataCenter.RowId != 0 && (w.IsPublic || char.IsUpper(w.Name.ToString()[0])
+                .Where(w => !w.Name.IsEmpty && w.DataCenter.RowId != 0 && (w.IsPublic || char.IsUpper(w.Name.ToString()[0])))
-                    || w is { RowId: > 1000, Region: 101 or 201 }))
                 .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
         });
         JobData = new(() =>
@@ -664,7 +659,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
         var location = new LocationInfo();
         location.ServerId = _playerState.CurrentWorld.RowId;
-        location.InstanceId = UIState.Instance()->PublicInstance.InstanceId; 
+        //location.InstanceId = UIState.Instance()->PublicInstance.InstanceId; //TODO:Need API update first
         location.TerritoryId = _clientState.TerritoryType;
         location.MapId = _clientState.MapId;
         if (houseMan != null)
@@ -690,7 +685,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 var outside = houseMan->OutdoorTerritory;
                 var house = outside->HouseId;
                 location.WardId = house.WardIndex + 1u;
-                //location.HouseId = (uint)houseMan->GetCurrentPlot() + 1;
+                location.HouseId = (uint)houseMan->GetCurrentPlot() + 1;
                 location.DivisionId = houseMan->GetCurrentDivision();
             }
             //_logger.LogWarning(LocationToString(location));
@@ -718,10 +713,10 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 str += $" - {MapData.Value[(ushort)location.MapId].MapName}";
             }
 
-            if (location.InstanceId is not 0)
+            // if (location.InstanceId is not 0)
-            {
+            // {
-                str += ((SeIconChar)(57520 + location.InstanceId)).ToIconString();
+            //     str += ((SeIconChar)(57520 + location.InstanceId)).ToIconString();
-            }
+            // }
 
             if (location.WardId is not 0)
             {
@@ -1140,18 +1135,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 Mediator.Publish(new ZoneSwitchEndMessage());
                 Mediator.Publish(new ResumeScanMessage(nameof(ConditionFlag.BetweenAreas)));
             }
-            
-            //Map
-            if (!_sentBetweenAreas)
-            {
-                var mapid = _clientState.MapId;
-                if (mapid != _lastMapId)
-                {
-                    _lastMapId = mapid;
-                    Mediator.Publish(new MapChangedMessage(mapid));
-                }
-            }
-            
 
             var localPlayer = _objectTable.LocalPlayer;
             if (localPlayer != null)

LightlessSync/Services/LocationShareService.cs

@@ -1,137 +0,0 @@
-using LightlessSync.API.Data;
-using LightlessSync.API.Dto.CharaData;
-using LightlessSync.API.Dto.User;
-using LightlessSync.Services.Mediator;
-using LightlessSync.WebAPI;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Primitives;
-
-namespace LightlessSync.Services
-{
-    public class LocationShareService : DisposableMediatorSubscriberBase
-    {
-        private readonly DalamudUtilService _dalamudUtilService;
-        private readonly ApiController _apiController;
-        private IMemoryCache _locations = new MemoryCache(new MemoryCacheOptions());
-        private IMemoryCache _sharingStatus = new MemoryCache(new MemoryCacheOptions());
-        private CancellationTokenSource _resetToken = new CancellationTokenSource();
-        
-        public LocationShareService(ILogger<LocationShareService> logger, LightlessMediator mediator, DalamudUtilService dalamudUtilService, ApiController apiController) : base(logger, mediator)
-        {
-            _dalamudUtilService = dalamudUtilService;
-            _apiController = apiController;
-
-
-            Mediator.Subscribe<DisconnectedMessage>(this, (msg) =>
-            {
-                _resetToken.Cancel();
-                _resetToken.Dispose();
-                _resetToken = new CancellationTokenSource();
-            });
-            Mediator.Subscribe<ConnectedMessage>(this, (msg) =>
-            {
-                _ = _apiController.UpdateLocation(new LocationDto(new UserData(_apiController.UID, apiController.DisplayName), _dalamudUtilService.GetMapData()));
-                _ = RequestAllLocation();
-            } );
-            Mediator.Subscribe<LocationSharingMessage>(this, UpdateLocationList);
-            Mediator.Subscribe<MapChangedMessage>(this,
-                msg => _ = _apiController.UpdateLocation(new LocationDto(new UserData(_apiController.UID, _apiController.DisplayName), _dalamudUtilService.GetMapData())));
-        }
-
-        private void UpdateLocationList(LocationSharingMessage msg)
-        {
-            if (_locations.TryGetValue(msg.User.UID, out _) && msg.LocationInfo.ServerId is 0)
-            {
-                _locations.Remove(msg.User.UID);
-                return;
-            }
-
-            if ( msg.LocationInfo.ServerId is not 0 && msg.ExpireAt > DateTime.UtcNow)
-            {
-                AddLocationInfo(msg.User.UID, msg.LocationInfo, msg.ExpireAt);
-            }
-        }
-
-        private void AddLocationInfo(string uid, LocationInfo location, DateTimeOffset expireAt)
-        {
-            var options = new MemoryCacheEntryOptions()
-                .SetAbsoluteExpiration(expireAt)
-                .AddExpirationToken(new CancellationChangeToken(_resetToken.Token));
-            _locations.Set(uid, location, options);
-        }
-
-        private async Task RequestAllLocation()
-        {
-            try
-            {
-                var (data, status) = await _apiController.RequestAllLocationInfo().ConfigureAwait(false);
-                foreach (var dto in data)
-                {
-                    AddLocationInfo(dto.LocationDto.User.UID, dto.LocationDto.Location, dto.ExpireAt);
-                }
-
-                foreach (var dto in status)
-                {
-                    AddStatus(dto.User.UID, dto.ExpireAt);
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.LogError(e,"RequestAllLocation error : ");
-                throw;
-            }
-        }
-
-        private void AddStatus(string uid, DateTimeOffset expireAt)
-        {
-            var options = new MemoryCacheEntryOptions()
-                .SetAbsoluteExpiration(expireAt)
-                .AddExpirationToken(new CancellationChangeToken(_resetToken.Token));
-            _sharingStatus.Set(uid, expireAt, options);
-        }
-
-        public string GetUserLocation(string uid)
-        {
-            try
-            {
-                if (_locations.TryGetValue<LocationInfo>(uid, out var location))
-                {
-                    return _dalamudUtilService.LocationToString(location);
-                }
-                return String.Empty;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError(e,"GetUserLocation error : ");
-                throw;
-            }
-        }
-
-        public DateTimeOffset GetSharingStatus(string uid)
-        {
-            try
-            {
-                if (_sharingStatus.TryGetValue<DateTimeOffset>(uid, out var expireAt))
-                {
-                    return expireAt;
-                }
-                return DateTimeOffset.MinValue;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError(e,"GetSharingStatus error : ");
-                throw;
-            }
-        }
-
-        public void UpdateSharingStatus(List<string> users, DateTimeOffset expireAt)
-        {
-            foreach (var user in users)
-            {
-                AddStatus(user, expireAt);
-            }
-        }
-        
-    }
-}

LightlessSync/Services/Mediator/Messages.cs

@@ -135,7 +135,5 @@ public record ChatChannelsUpdated : MessageBase;
 public record ChatChannelMessageAdded(string ChannelKey, ChatMessageEntry Message) : MessageBase;
 public record GroupCollectionChangedMessage : MessageBase;
 public record OpenUserProfileMessage(UserData User) : MessageBase;
-public record LocationSharingMessage(UserData User, LocationInfo LocationInfo, DateTimeOffset ExpireAt) : MessageBase;
-public record MapChangedMessage(uint MapId) : MessageBase;
 #pragma warning restore S2094
 #pragma warning restore MA0048 // File name must match type name

LightlessSync/Services/UiFactory.cs

@@ -105,7 +105,6 @@ public class UiFactory
             groupData: groupData,
             isLightfinderContext: isLightfinderContext,
             lightfinderCid: lightfinderCid,
-            performanceCollector: _performanceCollectorService,
+            performanceCollector: _performanceCollectorService);
-            _apiController);
     }
 }

LightlessSync/UI/Components/DrawUserPair.cs

@@ -37,7 +37,6 @@ public class DrawUserPair
     private readonly UiSharedService _uiSharedService;
     private readonly PlayerPerformanceConfigService _performanceConfigService;
     private readonly LightlessConfigService _configService;
-    private readonly LocationShareService _locationShareService;
     private readonly CharaDataManager _charaDataManager;
     private readonly PairLedger _pairLedger;
     private float _menuWidth = -1;
@@ -58,7 +57,6 @@ public class DrawUserPair
         UiSharedService uiSharedService,
         PlayerPerformanceConfigService performanceConfigService,
         LightlessConfigService configService,
-        LocationShareService locationShareService,
         CharaDataManager charaDataManager,
         PairLedger pairLedger)
     {
@@ -76,7 +74,6 @@ public class DrawUserPair
         _uiSharedService = uiSharedService;
         _performanceConfigService = performanceConfigService;
         _configService = configService;
-        _locationShareService = locationShareService;
         _charaDataManager = charaDataManager;
         _pairLedger = pairLedger;
     }
@@ -219,48 +216,6 @@ public class DrawUserPair
             _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(_pair.UserData, permissions));
         }
         UiSharedService.AttachToolTip("Changes VFX sync permissions with this user." + (individual ? individualText : string.Empty));
-        
-        ImGui.SetCursorPosX(10f);
-        _uiSharedService.IconText(FontAwesomeIcon.Globe);
-        ImGui.SameLine();
-        if (ImGui.BeginMenu("Toggle Location sharing"))
-        {
-            if (ImGui.MenuItem("Share for 30 Mins"))
-            {
-                _ = ToggleLocationSharing([_pair.UserData.UID], DateTimeOffset.UtcNow.AddMinutes(30)); 
-            }
-
-            if (ImGui.MenuItem("Share for 1 Hour"))
-            {
-                _ = ToggleLocationSharing([_pair.UserData.UID], DateTimeOffset.UtcNow.AddHours(1)); 
-            }
-
-            if (ImGui.MenuItem("Share for 3 Hours"))
-            {
-                _ = ToggleLocationSharing([_pair.UserData.UID], DateTimeOffset.UtcNow.AddHours(3));
-            }
-            
-            if (ImGui.MenuItem("Share until manually stop"))
-            {
-                _ = ToggleLocationSharing([_pair.UserData.UID], DateTimeOffset.MaxValue);
-            }
-            
-            ImGui.Separator();
-            if (ImGui.MenuItem("Stop Sharing"))
-            {
-                _ = ToggleLocationSharing([_pair.UserData.UID], DateTimeOffset.MinValue);
-            }
-            ImGui.EndMenu();
-        }
-    }
-
-    private async Task ToggleLocationSharing(List<string> users, DateTimeOffset expireAt)
-    {
-        var updated = await _apiController.ToggleLocationSharing(new LocationSharingToggleDto(users,  expireAt)).ConfigureAwait(false);
-        if (updated)
-        {
-            _locationShareService.UpdateSharingStatus(users, expireAt);
-        }
     }
 
     private void DrawIndividualMenu()
@@ -619,71 +574,6 @@ public class DrawUserPair
             var individualVFXDisabled = (_pair.UserPair?.OwnPermissions.IsDisableVFX() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableVFX() ?? false);
             var individualIsSticky = _pair.UserPair!.OwnPermissions.IsSticky();
             var individualIcon = individualIsSticky ? FontAwesomeIcon.ArrowCircleUp : FontAwesomeIcon.InfoCircle;
-            
-            var shareLocationIcon = FontAwesomeIcon.Globe;
-            var location = _locationShareService.GetUserLocation(_pair.UserPair!.User.UID);
-            var shareLocation = !string.IsNullOrEmpty(location);
-            var expireAt = _locationShareService.GetSharingStatus(_pair.UserPair!.User.UID);
-            var shareLocationToOther =  expireAt > DateTimeOffset.UtcNow;
-            var shareColor = shareLocation switch
-            {
-                true when shareLocationToOther => UIColors.Get("LightlessGreen"),
-                true when !shareLocationToOther => UIColors.Get("LightlessBlue"),
-                _ => UIColors.Get("LightlessYellow"),
-            };
-
-            if (shareLocation || shareLocationToOther)
-            {
-                currentRightSide -= (_uiSharedService.GetIconSize(shareLocationIcon).X + spacingX);
-                ImGui.SameLine(currentRightSide);
-                using (ImRaii.PushColor(ImGuiCol.Text, shareColor, shareLocation || shareLocationToOther))
-                    _uiSharedService.IconText(shareLocationIcon);
-
-                if (ImGui.IsItemHovered())
-                {
-                    ImGui.BeginTooltip();
-                    
-                    if (_pair.IsOnline)
-                    {
-                        if (shareLocation)
-                        {
-                            if (!string.IsNullOrEmpty(location))
-                            {
-                                _uiSharedService.IconText(FontAwesomeIcon.LocationArrow);
-                                ImGui.SameLine();
-                                ImGui.TextUnformatted(location);
-                            }
-                            else
-                            {
-                                ImGui.TextUnformatted("Location info not updated, reconnect or wait for update.");
-                            }
-                        }
-                        else
-                        {
-                            ImGui.TextUnformatted("NOT Sharing location with you. o(TヘTo)");
-                        }
-                    }
-                    else
-                    {
-                        ImGui.TextUnformatted("User not online. (´･ω･`)?");
-                    }
-                    ImGui.Separator();
-
-                    if (shareLocationToOther)
-                    {
-                        ImGui.TextUnformatted("Sharing your location. ヾ(•ω•`)o");
-                        if (expireAt != DateTimeOffset.MaxValue)
-                        {
-                            ImGui.TextUnformatted("Expires at " + expireAt.ToLocalTime().ToString("g"));
-                        }
-                    }
-                    else
-                    {
-                        ImGui.TextUnformatted("NOT sharing your location. ￣へ￣");
-                    }
-                    ImGui.EndTooltip();
-                }
-            }
 
             if (individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled || individualIsSticky)
             {

LightlessSync/UI/DataAnalysisUi.cs

@@ -2183,7 +2183,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         bool toggleClicked = false;
         if (showToggle)
         {
-            var icon = !isCollapsed ? FontAwesomeIcon.ChevronRight : FontAwesomeIcon.ChevronLeft;
+            var icon = isCollapsed ? FontAwesomeIcon.ChevronRight : FontAwesomeIcon.ChevronLeft;
             Vector2 iconSize;
             using (_uiSharedService.IconFont.Push())
             {

LightlessSync/UI/DrawEntityFactory.cs

@@ -29,7 +29,6 @@ public class DrawEntityFactory
     private readonly LightlessConfigService _configService;
     private readonly UiSharedService _uiSharedService;
     private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
-    private readonly LocationShareService _locationShareService;
     private readonly CharaDataManager _charaDataManager;
     private readonly SelectTagForPairUi _selectTagForPairUi;
     private readonly RenamePairTagUi _renamePairTagUi;
@@ -54,7 +53,6 @@ public class DrawEntityFactory
         LightlessConfigService configService,
         UiSharedService uiSharedService,
         PlayerPerformanceConfigService playerPerformanceConfigService,
-        LocationShareService locationShareService,
         CharaDataManager charaDataManager,
         SelectTagForSyncshellUi selectTagForSyncshellUi,
         RenameSyncshellTagUi renameSyncshellTagUi,
@@ -74,7 +72,6 @@ public class DrawEntityFactory
         _configService = configService;
         _uiSharedService = uiSharedService;
         _playerPerformanceConfigService = playerPerformanceConfigService;
-        _locationShareService = locationShareService;
         _charaDataManager = charaDataManager;
         _selectTagForSyncshellUi = selectTagForSyncshellUi;
         _renameSyncshellTagUi = renameSyncshellTagUi;
@@ -165,7 +162,6 @@ public class DrawEntityFactory
             _uiSharedService,
             _playerPerformanceConfigService,
             _configService,
-            _locationShareService,
             _charaDataManager,
             _pairLedger);
     }

LightlessSync/UI/StandaloneProfileUi.cs

@@ -11,7 +11,6 @@ using LightlessSync.Services.ServerConfiguration;
 using LightlessSync.UI.Services;
 using LightlessSync.UI.Tags;
 using LightlessSync.Utils;
-using LightlessSync.WebAPI;
 using Microsoft.Extensions.Logging;
 using System.Numerics;
 
@@ -23,7 +22,6 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
     private readonly PairUiService _pairUiService;
     private readonly ServerConfigurationManager _serverManager;
     private readonly ProfileTagService _profileTagService;
-    private readonly ApiController _apiController;
     private readonly UiSharedService _uiSharedService;
     private readonly UserData? _userData;
     private readonly GroupData? _groupData;
@@ -62,8 +60,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
         GroupData? groupData,
         bool isLightfinderContext,
         string? lightfinderCid,
-        PerformanceCollectorService performanceCollector,
+        PerformanceCollectorService performanceCollector)
-        ApiController apiController)
         : base(logger, mediator, BuildWindowTitle(
             userData,
             groupData,
@@ -97,7 +94,6 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
             .Apply();
 
         IsOpen = true;
-        _apiController = apiController;
     }
 
     public Pair? Pair { get; }
@@ -252,33 +248,19 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
                 ResetBannerTexture();
                 _lastBannerPicture = bannerBytes;
             }
+
             string? noteText = null;
-
+            string statusLabel = _isLightfinderContext ? "Exploring" : "Offline";
-            var isSelfProfile = !_isLightfinderContext
-                                && _userData is not null
-                                && !string.IsNullOrEmpty(_apiController.UID)
-                                && string.Equals(_userData.UID, _apiController.UID, StringComparison.Ordinal);
-
-            string statusLabel = _isLightfinderContext
-                ? "Exploring"
-                : isSelfProfile ? "Online" : "Offline";
-
             string? visiblePlayerName = null;
             bool directPair = false;
             bool youPaused = false;
             bool theyPaused = false;
             List<string> syncshellLines = [];
 
-            if (!_isLightfinderContext)
-            {
-                noteText = _serverManager.GetNoteForUid(_userData!.UID);
-            }
-
             if (!_isLightfinderContext && Pair != null)
             {
                 var snapshot = _pairUiService.GetSnapshot();
                 noteText = _serverManager.GetNoteForUid(Pair.UserData.UID);
-
                 statusLabel = Pair.IsVisible ? "Visible" : (Pair.IsOnline ? "Online" : "Offline");
                 visiblePlayerName = Pair.IsVisible ? Pair.PlayerName : null;
 
@@ -300,15 +282,11 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
                             var groupLabel = snapshot.GroupsByGid.TryGetValue(gid, out var groupInfo)
                                 ? groupInfo.GroupAliasOrGID
                                 : gid;
-
                             var groupNote = _serverManager.GetNoteForGid(gid);
                             syncshellLines.Add(string.IsNullOrEmpty(groupNote) ? groupLabel : $"{groupNote} ({groupLabel})");
                         }
                     }
                 }
-
-                if (isSelfProfile)
-                    statusLabel = "Online";
             }
 
             var presenceTokens = new List<PresenceToken>

LightlessSync/UI/SyncshellAdminUI.cs

@@ -116,7 +116,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
         var drawList = ImGui.GetWindowDrawList();
 
         var purple = UIColors.Get("LightlessPurple");
-        var gradLeft = purple.WithAlpha(0.0f);
+        var gradLeft = purple.WithAlpha(0.0f); 
         var gradRight = purple.WithAlpha(0.85f);
 
         uint colTopLeft = ImGui.ColorConvertFloat4ToU32(gradLeft);
@@ -162,7 +162,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
 
         var subtitlePos = new Vector2(
             pMin.X + 12f * scale,
-            titlePos.Y + titleHeight - 2f * scale);
+            titlePos.Y + titleHeight - 2f * scale); 
 
         ImGui.SetCursorScreenPos(subtitlePos);
         ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudGrey);
@@ -392,27 +392,25 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
         }
         UiSharedService.AttachToolTip("When enabled, inactive non-pinned, non-moderator users will be pruned automatically on the server.");
 
-
-        if (!_autoPruneEnabled)
-        {
-            ImGui.BeginDisabled();
-        }
         ImGui.SameLine();
         ImGui.SetNextItemWidth(150);
-        _uiSharedService.DrawCombo(
+
-            "Day(s) of inactivity (gets checked hourly)",
+        using (ImRaii.Disabled(!_autoPruneEnabled))
-            [0, 1, 3, 7, 14, 30, 90],
+        {
-            (count) => count == 0 ? "2 hours(s)" : count + " day(s)",
+            _uiSharedService.DrawCombo(
-            selected =>
+                "Day(s) of inactivity",
-            {
+                [1, 3, 7, 14, 30, 90],
-                _autoPruneDays = selected;
+                days => $"{days} day(s)",
-                SavePruneSettings();
+                selected =>
-            },
+                {
-            _autoPruneDays);
+                    _autoPruneDays = selected;
+                    SavePruneSettings();
+                },
+                _autoPruneDays);
+        }
 
         if (!_autoPruneEnabled)
         {
-            ImGui.EndDisabled();
             UiSharedService.ColorTextWrapped(
                 "Automatic prune is currently disabled. Enable it and choose an inactivity threshold to let the server clean up inactive users automatically.",
                 ImGuiColors.DalamudGrey);
@@ -595,7 +593,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
         _uiSharedService.DrawCombo(
             "Day(s) of inactivity",
             [0, 1, 3, 7, 14, 30, 90],
-            (count) => count == 0 ? "2 hours(s)" : count + " day(s)",
+            (count) => count == 0 ? "15 minute(s)" : count + " day(s)",
             (selected) =>
             {
                 _pruneDays = selected;
@@ -665,8 +663,8 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
         var style = ImGui.GetStyle();
         float fullW = ImGui.GetContentRegionAvail().X;
 
-        float colIdentity = fullW * 0.45f;
+        float colIdentity = fullW * 0.45f; 
-        float colMeta = fullW * 0.35f;
+        float colMeta = fullW * 0.35f; 
         float colActions = fullW - colIdentity - colMeta - style.ItemSpacing.X * 2.0f;
 
         // Header
@@ -875,7 +873,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
 
         var boolcolor = UiSharedService.GetBoolColor(pair.IsOnline);
         UiSharedService.ColorText(text, boolcolor);
-
+        
         if (ImGui.IsItemClicked())
             ImGui.SetClipboardText(pair.UserData.AliasOrUID);
 
@@ -1095,7 +1093,6 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
 
         ImGui.Dummy(new Vector2(0, 4 * ImGuiHelpers.GlobalScale));
     }
-
     private void SavePruneSettings()
     {
         if (_autoPruneDays <= 0)
@@ -1103,7 +1100,8 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
             _autoPruneEnabled = false;
         }
 
-        var dto = new GroupPruneSettingsDto(Group: GroupFullInfo.Group, AutoPruneEnabled: _autoPruneEnabled, AutoPruneDays: _autoPruneDays);
+        var enabled = _autoPruneEnabled && _autoPruneDays > 0;
+        var dto = new GroupPruneSettingsDto(Group: GroupFullInfo.Group, AutoPruneEnabled: enabled, AutoPruneDays: enabled ? _autoPruneDays : 0);
 
         try
         {

LightlessSync/WebAPI/Files/FileDownloadManager.cs

@@ -28,10 +28,6 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
     private readonly TextureMetadataHelper _textureMetadataHelper;
 
     private readonly ConcurrentDictionary<ThrottledStream, byte> _activeDownloadStreams;
-    private readonly SemaphoreSlim _decompressGate =
-    new(Math.Max(1, Environment.ProcessorCount / 2), Math.Max(1, Environment.ProcessorCount / 2));
-    
-    private readonly ConcurrentQueue<string> _deferredCompressionQueue = new();
 
     private volatile bool _disableDirectDownloads;
     private int _consecutiveDirectDownloadFailures;
@@ -504,14 +500,6 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         }
     }
 
-    private void RemoveStatus(string key)
-    {
-        lock (_downloadStatusLock)
-        {
-            _downloadStatus.Remove(key);
-        }
-    }
-
     private async Task DecompressBlockFileAsync(
         string downloadStatusKey,
         string blockFilePath,
@@ -534,61 +522,32 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
                     try
                     {
-                        // sanity check length
                         if (fileLengthBytes < 0 || fileLengthBytes > int.MaxValue)
                             throw new InvalidDataException($"Invalid block entry length: {fileLengthBytes}");
 
-                        // safe cast after check
-                        var len = checked((int)fileLengthBytes);
-
                         if (!replacementLookup.TryGetValue(fileHash, out var repl))
                         {
                             Logger.LogWarning("{dlName}: No replacement mapping for {fileHash}", downloadLabel, fileHash);
-                            fileBlockStream.Seek(len, SeekOrigin.Current);
+                            // still need to skip bytes:
+                            var skip = checked((int)fileLengthBytes);
+                            fileBlockStream.Position += skip;
                             continue;
                         }
 
-                        // decompress
                         var filePath = _fileDbManager.GetCacheFilePath(fileHash, repl.Extension);
-                        Logger.LogTrace("{dlName}: Decompressing {file}:{len} => {dest}", downloadLabel, fileHash, fileLengthBytes, filePath);
 
-                        // read compressed data
+                        Logger.LogDebug("{dlName}: Decompressing {file}:{len} => {dest}", downloadLabel, fileHash, fileLengthBytes, filePath);
+
+                        var len = checked((int)fileLengthBytes);
                         var compressed = new byte[len];
+
                         await ReadExactlyAsync(fileBlockStream, compressed.AsMemory(0, len), ct).ConfigureAwait(false);
 
-                        if (len == 0)
-                        {
-                            await File.WriteAllBytesAsync(filePath, Array.Empty<byte>(), ct).ConfigureAwait(false);
-                            PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale);
-                            continue;
-                        }
-
                         MungeBuffer(compressed);
+                        var decompressed = LZ4Wrapper.Unwrap(compressed);
 
-                        // limit concurrent decompressions
+                        await _fileCompactor.WriteAllBytesAsync(filePath, decompressed, ct).ConfigureAwait(false);
-                        await _decompressGate.WaitAsync(ct).ConfigureAwait(false);
+                        PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale);
-                        try
-                        {
-                            // offload CPU-intensive decompression to threadpool to free up worker
-                            await Task.Run(async () =>
-                            {
-                                var sw = System.Diagnostics.Stopwatch.StartNew();
-
-                                // decompress
-                                var decompressed = LZ4Wrapper.Unwrap(compressed);
-
-                                Logger.LogTrace("{dlName}: Unwrap {fileHash} took {ms}ms (compressed {c} bytes, decompressed {d} bytes)",
-                                    downloadLabel, fileHash, sw.ElapsedMilliseconds, compressed.Length, decompressed?.Length ?? -1);
-
-                                // write to file without compacting during download
-                                await File.WriteAllBytesAsync(filePath, decompressed, ct).ConfigureAwait(false);
-                                PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale);
-                            }, ct).ConfigureAwait(false);
-                        }
-                        finally
-                        {
-                            _decompressGate.Release();
-                        }
                     }
                     catch (EndOfStreamException)
                     {
@@ -609,10 +568,6 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         {
             Logger.LogError(ex, "{dlName}: Error during block file read", downloadLabel);
         }
-        finally
-        {
-            RemoveStatus(downloadStatusKey);
-        }
     }
 
     public async Task<List<DownloadFileTransfer>> InitiateDownloadList(
@@ -650,16 +605,20 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
             .. await FilesGetSizes(hashes, ct).ConfigureAwait(false),
         ];
 
+        Logger.LogDebug("Files with size 0 or less: {files}",
+            string.Join(", ", downloadFileInfoFromService.Where(f => f.Size <= 0).Select(f => f.Hash)));
+
         foreach (var dto in downloadFileInfoFromService.Where(c => c.IsForbidden))
         {
             if (!_orchestrator.ForbiddenTransfers.Exists(f => string.Equals(f.Hash, dto.Hash, StringComparison.Ordinal)))
                 _orchestrator.ForbiddenTransfers.Add(new DownloadFileTransfer(dto));
         }
 
-        CurrentDownloads = [.. downloadFileInfoFromService
+        CurrentDownloads = downloadFileInfoFromService
             .Distinct()
             .Select(d => new DownloadFileTransfer(d))
-            .Where(d => d.CanBeTransferred)];
+            .Where(d => d.CanBeTransferred)
+            .ToList();
 
         return CurrentDownloads;
     }
@@ -758,16 +717,8 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         if (gameObjectHandler is not null)
             Mediator.Publish(new DownloadStartedMessage(gameObjectHandler, _downloadStatus));
 
-        // work based on cpu count and slots
-        var coreCount = Environment.ProcessorCount;
-        var baseWorkers = Math.Min(slots, coreCount);
-
-        // only add buffer if decompression has capacity AND we have cores to spare
-        var availableDecompressSlots = _decompressGate.CurrentCount;
-        var extraWorkers = (availableDecompressSlots > 0 && coreCount >= 6) ? 2 : 0;
-
         // allow some extra workers so downloads can continue while earlier items decompress.
-        var workerDop = Math.Clamp(baseWorkers + extraWorkers, 2, coreCount);
+        var workerDop = Math.Clamp(slots * 2, 2, 16);
 
         // batch downloads
         Task batchTask = batchChunks.Length == 0
@@ -783,9 +734,6 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
         await Task.WhenAll(batchTask, directTask).ConfigureAwait(false);
 
-        // process deferred compressions after all downloads complete
-        await ProcessDeferredCompressionsAsync(ct).ConfigureAwait(false);
-
         Logger.LogDebug("Download end: {id}", objectName);
         ClearDownload();
     }
@@ -890,13 +838,11 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
             byte[] compressedBytes = await File.ReadAllBytesAsync(tempFilename, ct).ConfigureAwait(false);
             var decompressedBytes = LZ4Wrapper.Unwrap(compressedBytes);
 
-            await File.WriteAllBytesAsync(finalFilename, decompressedBytes, ct).ConfigureAwait(false);
+            await _fileCompactor.WriteAllBytesAsync(finalFilename, decompressedBytes, ct).ConfigureAwait(false);
             PersistFileToStorage(directDownload.Hash, finalFilename, repl.GamePath, skipDownscale);
 
             MarkTransferredFiles(directDownload.DirectDownloadUrl!, 1);
             Logger.LogDebug("Finished direct download of {hash}.", directDownload.Hash);
-
-            RemoveStatus(directDownload.DirectDownloadUrl!);
         }
         catch (OperationCanceledException ex)
         {
@@ -1018,10 +964,6 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         fi.LastAccessTime = DateTime.Today;
         fi.LastWriteTime = RandomDayInThePast().Invoke();
 
-        // queue file for deferred compression instead of compressing immediately
-        if (_configService.Current.UseCompactor)
-            _deferredCompressionQueue.Enqueue(filePath);
-
         try
         {
             var entry = _fileDbManager.CreateCacheEntry(filePath);
@@ -1047,52 +989,6 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
     private static IProgress<long> CreateInlineProgress(Action<long> callback) => new InlineProgress(callback);
 
-    private async Task ProcessDeferredCompressionsAsync(CancellationToken ct)
-    {
-        if (_deferredCompressionQueue.IsEmpty)
-            return;
-
-        var filesToCompress = new List<string>();
-        while (_deferredCompressionQueue.TryDequeue(out var filePath))
-        {
-            if (File.Exists(filePath))
-                filesToCompress.Add(filePath);
-        }
-
-        if (filesToCompress.Count == 0)
-            return;
-
-        Logger.LogDebug("Starting deferred compression of {count} files", filesToCompress.Count);
-
-        var compressionWorkers = Math.Clamp(Environment.ProcessorCount / 4, 2, 4);
-
-        await Parallel.ForEachAsync(filesToCompress, 
-            new ParallelOptions 
-            { 
-                MaxDegreeOfParallelism = compressionWorkers, 
-                CancellationToken = ct 
-            },
-            async (filePath, token) =>
-            {
-                try 
-                { 
-                    await Task.Yield();
-                    if (_configService.Current.UseCompactor && File.Exists(filePath))
-                    {
-                        var bytes = await File.ReadAllBytesAsync(filePath, token).ConfigureAwait(false);
-                        await _fileCompactor.WriteAllBytesAsync(filePath, bytes, token).ConfigureAwait(false);
-                        Logger.LogTrace("Compressed file: {filePath}", filePath);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogWarning(ex, "Failed to compress file: {filePath}", filePath);
-                }
-            }).ConfigureAwait(false);
-
-        Logger.LogDebug("Completed deferred compression of {count} files", filesToCompress.Count);
-    }
-
     private sealed class InlineProgress : IProgress<long>
     {
         private readonly Action<long> _callback;

LightlessSync/WebAPI/SignalR/ApIController.Functions.Users.cs

@@ -200,21 +200,5 @@ public partial class ApiController
 
         await UserPushData(new(visibleCharacters, character, censusDto)).ConfigureAwait(false);
     }
-    
-    public async Task UpdateLocation(LocationDto locationDto, bool offline = false)
-    {
-        if (!IsConnected) return;
-        await _lightlessHub!.SendAsync(nameof(UpdateLocation), locationDto, offline).ConfigureAwait(false);
-    }
-    public async Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo()
-    {
-        if (!IsConnected) return ([],[]);
-        return await _lightlessHub!.InvokeAsync<(List<LocationWithTimeDto>, List<SharingStatusDto>)>(nameof(RequestAllLocationInfo)).ConfigureAwait(false);
-    }
-    public async Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto)
-    {
-        if (!IsConnected) return false;
-        return await _lightlessHub!.InvokeAsync<bool>(nameof(ToggleLocationSharing), dto).ConfigureAwait(false);
-    }
 }
 #pragma warning restore MA0040

LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs

@@ -259,13 +259,6 @@ public partial class ApiController
         ExecuteSafely(() => Mediator.Publish(new GPoseLobbyReceiveWorldData(userData, worldData)));
         return Task.CompletedTask;
     }
-    
-    public Task Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt)
-    {
-        Logger.LogDebug($"{nameof(Client_SendLocationToClient)}: {locationDto.User} {expireAt}");
-        ExecuteSafely(() => Mediator.Publish(new LocationSharingMessage(locationDto.User, locationDto.Location,  expireAt)));
-        return Task.CompletedTask;
-    }
 
     public void OnDownloadReady(Action<Guid> act)
     {
@@ -448,12 +441,6 @@ public partial class ApiController
         _lightlessHub!.On(nameof(Client_GposeLobbyPushWorldData), act);
     }
 
-    public void OnReceiveLocation(Action<LocationDto, DateTimeOffset> act)
-    {
-        if (_initialized) return;
-        _lightlessHub!.On(nameof(Client_SendLocationToClient), act);
-    }
-
     private void ExecuteSafely(Action act)
     {
         try

LightlessSync/WebAPI/SignalR/ApiController.cs

@@ -606,7 +606,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
         OnGposeLobbyPushCharacterData((dto) => _ = Client_GposeLobbyPushCharacterData(dto));
         OnGposeLobbyPushPoseData((dto, data) => _ = Client_GposeLobbyPushPoseData(dto, data));
         OnGposeLobbyPushWorldData((dto, data) => _ = Client_GposeLobbyPushWorldData(dto, data));
-        OnReceiveLocation((dto, time) => _ = Client_SendLocationToClient(dto, time));
 
         _healthCheckTokenSource?.Cancel();
         _healthCheckTokenSource?.Dispose();
@@ -775,6 +774,5 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
 
         ServerState = state;
     }
-
 }
 #pragma warning restore MA0040