Mare 0.9 (#65)

* add jwt expiry

* start of 0.9 api impl

* some stuff idk

* some more impl

* some cleanup

* remove grouppair, add configuration, rework some pair drawing stuff

* do some stuff

* rework some ui

* I don't even know anymore

* add cancellationtoken

* token bla

* ui fixes etc

* probably individual adding/removing now working fully as expected

* add working report popup

* I guess it's more syncshell shit or so

* popup shit idk

* work out most of the syncshell bullshit I guess

* delete some old crap

* are we actually getting closer to the end

* update pair info stuff

* more fixes/adjustments, idk

* refactor some things

* some rework

* some more cleanup

* cleanup

* make menu buttons w i d e

* better icon text buttons

* add all syncshell folder and ordering fixes

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>

MareSynchronos/FileCache/FileCacheEntity.cs

@@ -13,14 +13,14 @@ public class FileCacheEntity
         LastModifiedDateTicks = lastModifiedDateTicks;
     }
 
-    public bool IsCacheEntry => PrefixedFilePath.StartsWith(FileCacheManager.CachePrefix, StringComparison.OrdinalIgnoreCase);
+    public long? CompressedSize { get; set; }
     public string CsvEntry => $"{Hash}{FileCacheManager.CsvSplit}{PrefixedFilePath}{FileCacheManager.CsvSplit}{LastModifiedDateTicks}|{Size ?? -1}|{CompressedSize ?? -1}";
     public string Hash { get; set; }
+    public bool IsCacheEntry => PrefixedFilePath.StartsWith(FileCacheManager.CachePrefix, StringComparison.OrdinalIgnoreCase);
     public string LastModifiedDateTicks { get; set; }
     public string PrefixedFilePath { get; init; }
     public string ResolvedFilepath { get; private set; } = string.Empty;
     public long? Size { get; set; }
-    public long? CompressedSize { get; set; }
 
     public void SetResolvedFilePath(string filePath)
     {

MareSynchronos/FileCache/FileCacheManager.cs

@@ -11,8 +11,8 @@ namespace MareSynchronos.FileCache;
 
 public sealed class FileCacheManager : IDisposable
 {
-    public const string CsvSplit = "|";
     public const string CachePrefix = "{cache}";
+    public const string CsvSplit = "|";
     public const string PenumbraPrefix = "{penumbra}";
     private readonly MareConfigService _configService;
     private readonly string _csvPath;
@@ -55,7 +55,7 @@ public sealed class FileCacheManager : IDisposable
         if (File.Exists(_csvPath))
         {
             bool success = false;
-            string[] entries = Array.Empty<string>();
+            string[] entries = [];
             int attempts = 0;
             while (!success && attempts < 10)
             {
@@ -94,7 +94,7 @@ public sealed class FileCacheManager : IDisposable
                         continue;
                     }
 
-                    processedFiles.Add(path, true);
+                    processedFiles.Add(path, value: true);
 
                     long size = -1;
                     long compressed = -1;
@@ -157,11 +157,33 @@ public sealed class FileCacheManager : IDisposable
 
     public List<FileCacheEntity> GetAllFileCaches() => _fileCaches.Values.SelectMany(v => v).ToList();
 
+    public List<FileCacheEntity> GetAllFileCachesByHash(string hash)
+    {
+        List<FileCacheEntity> output = [];
+        if (_fileCaches.TryGetValue(hash, out var fileCacheEntities))
+        {
+            foreach (var filecache in fileCacheEntities.ToList())
+            {
+                var validated = GetValidatedFileCache(filecache);
+                if (validated != null) output.Add(validated);
+            }
+        }
+
+        return output;
+    }
+
     public string GetCacheFilePath(string hash, string extension)
     {
         return Path.Combine(_configService.Current.CacheFolder, hash + "." + extension);
     }
 
+    public async Task<(string, byte[])> GetCompressedFileData(string fileHash, CancellationToken uploadToken)
+    {
+        var fileCache = GetFileCacheByHash(fileHash)!.ResolvedFilepath;
+        return (fileHash, LZ4Codec.WrapHC(await File.ReadAllBytesAsync(fileCache, uploadToken).ConfigureAwait(false), 0,
+            (int)new FileInfo(fileCache).Length));
+    }
+
     public FileCacheEntity? GetFileCacheByHash(string hash)
     {
         if (_fileCaches.TryGetValue(hash, out var hashes))
@@ -172,19 +194,20 @@ public sealed class FileCacheManager : IDisposable
         return null;
     }
 
-    public List<FileCacheEntity> GetAllFileCachesByHash(string hash)
+    public FileCacheEntity? GetFileCacheByPath(string path)
     {
-        List<FileCacheEntity> output = new();
+        var cleanedPath = path.Replace("/", "\\", StringComparison.OrdinalIgnoreCase).ToLowerInvariant().Replace(_ipcManager.PenumbraModDirectory!.ToLowerInvariant(), "", StringComparison.OrdinalIgnoreCase);
-        if (_fileCaches.TryGetValue(hash, out var fileCacheEntities))
+        var entry = _fileCaches.SelectMany(v => v.Value).FirstOrDefault(f => f.ResolvedFilepath.EndsWith(cleanedPath, StringComparison.OrdinalIgnoreCase));
+
+        if (entry == null)
         {
-            foreach (var filecache in fileCacheEntities.ToList())
+            _logger.LogDebug("Found no entries for {path}", cleanedPath);
-            {
+            return CreateFileEntry(path);
-                var validated = GetValidatedFileCache(filecache);
-                if (validated != null) output.Add(validated);
-            }
         }
 
-        return output;
+        var validatedCacheEntry = GetValidatedFileCache(entry);
+
+        return validatedCacheEntry;
     }
 
     public Dictionary<string, FileCacheEntity?> GetFileCachesByPaths(string[] paths)
@@ -217,29 +240,6 @@ public sealed class FileCacheManager : IDisposable
         return result;
     }
 
-    public FileCacheEntity? GetFileCacheByPath(string path)
-    {
-        var cleanedPath = path.Replace("/", "\\", StringComparison.OrdinalIgnoreCase).ToLowerInvariant().Replace(_ipcManager.PenumbraModDirectory!.ToLowerInvariant(), "", StringComparison.OrdinalIgnoreCase);
-        var entry = _fileCaches.SelectMany(v => v.Value).FirstOrDefault(f => f.ResolvedFilepath.EndsWith(cleanedPath, StringComparison.OrdinalIgnoreCase));
-
-        if (entry == null)
-        {
-            _logger.LogDebug("Found no entries for {path}", cleanedPath);
-            return CreateFileEntry(path);
-        }
-
-        var validatedCacheEntry = GetValidatedFileCache(entry);
-
-        return validatedCacheEntry;
-    }
-
-    public async Task<(string, byte[])> GetCompressedFileData(string fileHash, CancellationToken uploadToken)
-    {
-        var fileCache = GetFileCacheByHash(fileHash)!.ResolvedFilepath;
-        return (fileHash, LZ4Codec.WrapHC(await File.ReadAllBytesAsync(fileCache, uploadToken).ConfigureAwait(false), 0,
-            (int)new FileInfo(fileCache).Length));
-    }
-
     public void RemoveHashedFile(string hash, string prefixedFilePath)
     {
         if (_fileCaches.TryGetValue(hash, out var caches))
@@ -316,14 +316,12 @@ public sealed class FileCacheManager : IDisposable
         try
         {
             RemoveHashedFile(fileCache.Hash, fileCache.PrefixedFilePath);
-            FileInfo oldCache = new(fileCache.ResolvedFilepath);
+            FileInfo fileInfo = new(fileCache.ResolvedFilepath);
-            var extensionPath = fileCache.ResolvedFilepath.ToUpper() + "." + ext;
+            FileInfo oldCache = fileInfo;
-            File.Move(fileCache.ResolvedFilepath, extensionPath, true);
+            var extensionPath = fileCache.ResolvedFilepath.ToUpper(CultureInfo.InvariantCulture) + "." + ext;
-            var newHashedEntity = new FileCacheEntity(fileCache.Hash, fileCache.PrefixedFilePath + "." + ext, DateTime.UtcNow.Ticks.ToString());
+            File.Move(fileCache.ResolvedFilepath, extensionPath, overwrite: true);
+            var newHashedEntity = new FileCacheEntity(fileCache.Hash, fileCache.PrefixedFilePath + "." + ext, DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture));
             newHashedEntity.SetResolvedFilePath(extensionPath);
-            FileInfo newCache = new FileInfo(extensionPath);
-            newCache.LastAccessTime = oldCache.LastAccessTime;
-            newCache.LastWriteTime = oldCache.LastWriteTime;
             AddHashedFile(newHashedEntity);
             _logger.LogDebug("Migrated from {oldPath} to {newPath}", fileCache.ResolvedFilepath, newHashedEntity.ResolvedFilepath);
             return newHashedEntity;
@@ -340,7 +338,7 @@ public sealed class FileCacheManager : IDisposable
     {
         if (!_fileCaches.TryGetValue(fileCache.Hash, out var entries))
         {
-            _fileCaches[fileCache.Hash] = entries = new();
+            _fileCaches[fileCache.Hash] = entries = [];
         }
 
         if (!entries.Exists(u => string.Equals(u.PrefixedFilePath, fileCache.PrefixedFilePath, StringComparison.OrdinalIgnoreCase)))
@@ -394,7 +392,7 @@ public sealed class FileCacheManager : IDisposable
             return null;
         }
 
-        if (!string.Equals(file.LastWriteTimeUtc.Ticks.ToString(), fileCache.LastModifiedDateTicks, StringComparison.Ordinal))
+        if (!string.Equals(file.LastWriteTimeUtc.Ticks.ToString(CultureInfo.InvariantCulture), fileCache.LastModifiedDateTicks, StringComparison.Ordinal))
         {
             UpdateHashedFile(fileCache);
         }

MareSynchronos/FileCache/FileCompactor.cs

@@ -137,8 +137,10 @@ public sealed class FileCompactor
         {
             using (var fs = new FileStream(path, FileMode.Open))
             {
+#pragma warning disable S3869 // "SafeHandle.DangerousGetHandle" should not be called
                 var hDevice = fs.SafeFileHandle.DangerousGetHandle();
-                var ret = DeviceIoControl(hDevice, FSCTL_DELETE_EXTERNAL_BACKING, nint.Zero, 0, nint.Zero, 0, out _, out _);
+#pragma warning restore S3869 // "SafeHandle.DangerousGetHandle" should not be called
+                _ = DeviceIoControl(hDevice, FSCTL_DELETE_EXTERNAL_BACKING, nint.Zero, 0, nint.Zero, 0, out _, out _);
             }
         }
         catch (Exception ex)
@@ -153,7 +155,7 @@ public sealed class FileCompactor
         if (!fi.Exists) return -1;
         var root = fi.Directory?.Root.FullName.ToLower() ?? string.Empty;
         if (string.IsNullOrEmpty(root)) return -1;
-        if (_clusterSizes.ContainsKey(root)) return _clusterSizes[root];
+        if (_clusterSizes.TryGetValue(root, out int value)) return value;
         _logger.LogDebug("Getting Cluster Size for {path}, root {root}", filePath, root);
         int result = GetDiskFreeSpaceW(root, out uint sectorsPerCluster, out uint bytesPerSector, out _, out _);
         if (result == 0) return -1;
@@ -162,7 +164,7 @@ public sealed class FileCompactor
         return _clusterSizes[root];
     }
 
-    private bool IsCompactedFile(string filePath)
+    private static bool IsCompactedFile(string filePath)
     {
         uint buf = 8;
         _ = WofIsExternalFile(filePath, out int isExtFile, out uint _, out var info, ref buf);
@@ -173,13 +175,15 @@ public sealed class FileCompactor
     private void WOFCompressFile(string path)
     {
         var efInfoPtr = Marshal.AllocHGlobal(Marshal.SizeOf(_efInfo));
-        Marshal.StructureToPtr(_efInfo, efInfoPtr, true);
+        Marshal.StructureToPtr(_efInfo, efInfoPtr, fDeleteOld: true);
         ulong length = (ulong)Marshal.SizeOf(_efInfo);
         try
         {
             using (var fs = new FileStream(path, FileMode.Open))
             {
+#pragma warning disable S3869 // "SafeHandle.DangerousGetHandle" should not be called
                 var hFile = fs.SafeFileHandle.DangerousGetHandle();
+#pragma warning restore S3869 // "SafeHandle.DangerousGetHandle" should not be called
                 if (fs.SafeFileHandle.IsInvalid)
                 {
                     _logger.LogWarning("Invalid file handle to {file}", path);

MareSynchronos/FileCache/FileState.cs

@@ -1,9 +1,8 @@
 namespace MareSynchronos.FileCache;
 
-
 public enum FileState
 {
     Valid,
     RequireUpdate,
     RequireDeletion,
-}
+}

MareSynchronos/FileCache/PeriodicFileScanner.cs

@@ -10,11 +10,11 @@ namespace MareSynchronos.FileCache;
 public sealed class PeriodicFileScanner : DisposableMediatorSubscriberBase
 {
     private readonly MareConfigService _configService;
+    private readonly DalamudUtilService _dalamudUtil;
+    private readonly FileCompactor _fileCompactor;
     private readonly FileCacheManager _fileDbManager;
     private readonly IpcManager _ipcManager;
     private readonly PerformanceCollectorService _performanceCollector;
-    private readonly DalamudUtilService _dalamudUtil;
-    private readonly FileCompactor _fileCompactor;
     private long _currentFileProgress = 0;
     private bool _fileScanWasRunning = false;
     private CancellationTokenSource _scanCancellationTokenSource = new();
@@ -38,15 +38,12 @@ public sealed class PeriodicFileScanner : DisposableMediatorSubscriberBase
     }
 
     public long CurrentFileProgress => _currentFileProgress;
-    public long TotalFilesStorage { get; private set; }
     public long FileCacheSize { get; set; }
     public ConcurrentDictionary<string, int> HaltScanLocks { get; set; } = new(StringComparer.Ordinal);
     public bool IsScanRunning => CurrentFileProgress > 0 || TotalFiles > 0;
-
     public string TimeUntilNextScan => _timeUntilNextScan.ToString(@"mm\:ss");
-
     public long TotalFiles { get; private set; }
-
+    public long TotalFilesStorage { get; private set; }
     private int TimeBetweenScans => _configService.Current.TimeSpanBetweenScansInSeconds;
 
     public void HaltScan(string source)
@@ -213,19 +210,22 @@ public sealed class PeriodicFileScanner : DisposableMediatorSubscriberBase
         var previousThreadPriority = Thread.CurrentThread.Priority;
         Thread.CurrentThread.Priority = ThreadPriority.Lowest;
         Logger.LogDebug("Getting files from {penumbra} and {storage}", penumbraDir, _configService.Current.CacheFolder);
-        string[] ext = { ".mdl", ".tex", ".mtrl", ".tmb", ".pap", ".avfx", ".atex", ".sklb", ".eid", ".phyb", ".scd", ".skp", ".shpk" };
+        string[] ext = [".mdl", ".tex", ".mtrl", ".tmb", ".pap", ".avfx", ".atex", ".sklb", ".eid", ".phyb", ".scd", ".skp", ".shpk"];
 
         Dictionary<string, string[]> penumbraFiles = new(StringComparer.Ordinal);
         foreach (var folder in Directory.EnumerateDirectories(penumbraDir!))
         {
             try
             {
-                penumbraFiles[folder] = Directory.GetFiles(folder, "*.*", SearchOption.AllDirectories)
+                penumbraFiles[folder] =
-                        .AsParallel()
+                [
-                        .Where(f => ext.Any(e => f.EndsWith(e, StringComparison.OrdinalIgnoreCase))
+                    .. Directory.GetFiles(folder, "*.*", SearchOption.AllDirectories)
-                            && !f.Contains(@"\bg\", StringComparison.OrdinalIgnoreCase)
+                                            .AsParallel()
-                            && !f.Contains(@"\bgcommon\", StringComparison.OrdinalIgnoreCase)
+                                            .Where(f => ext.Any(e => f.EndsWith(e, StringComparison.OrdinalIgnoreCase))
-                            && !f.Contains(@"\ui\", StringComparison.OrdinalIgnoreCase)).ToArray();
+                                                && !f.Contains(@"\bg\", StringComparison.OrdinalIgnoreCase)
+                                                && !f.Contains(@"\bgcommon\", StringComparison.OrdinalIgnoreCase)
+                                                && !f.Contains(@"\ui\", StringComparison.OrdinalIgnoreCase)),
+                ];
             }
             catch (Exception ex)
             {
@@ -239,7 +239,7 @@ public sealed class PeriodicFileScanner : DisposableMediatorSubscriberBase
                                 .AsParallel()
                                 .Where(f =>
                                 {
-                                    var val = f.Split('\\').Last();
+                                    var val = f.Split('\\')[^1];
                                     return val.Length == 40 || (val.Split('.').FirstOrDefault()?.Length ?? 0) == 40;
                                 });
 
@@ -260,8 +260,8 @@ public sealed class PeriodicFileScanner : DisposableMediatorSubscriberBase
         // scan files from database
         var threadCount = Math.Clamp((int)(Environment.ProcessorCount / 2.0f), 2, 8);
 
-        List<FileCacheEntity> entitiesToRemove = new();
+        List<FileCacheEntity> entitiesToRemove = [];
-        List<FileCacheEntity> entitiesToUpdate = new();
+        List<FileCacheEntity> entitiesToUpdate = [];
         object sync = new();
         Thread[] workerThreads = new Thread[threadCount];
 

MareSynchronos/FileCache/TransientResourceManager.cs

@@ -14,9 +14,9 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
     private readonly HashSet<string> _cachedHandledPaths = new(StringComparer.Ordinal);
     private readonly TransientConfigService _configurationService;
     private readonly DalamudUtilService _dalamudUtil;
-    private readonly string[] _fileTypesToHandle = new[] { "tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk" };
+    private readonly string[] _fileTypesToHandle = ["tmb", "pap", "avfx", "atex", "sklb", "eid", "phyb", "scd", "skp", "shpk"];
-    private readonly HashSet<GameObjectHandler> _playerRelatedPointers = new();
+    private readonly HashSet<GameObjectHandler> _playerRelatedPointers = [];
-    private HashSet<IntPtr> _cachedFrameAddresses = new();
+    private HashSet<IntPtr> _cachedFrameAddresses = [];
 
     public TransientResourceManager(ILogger<TransientResourceManager> logger, TransientConfigService configurationService,
         DalamudUtilService dalamudUtil, MareMediator mediator) : base(logger, mediator)
@@ -68,17 +68,17 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
     public void CleanUpSemiTransientResources(ObjectKind objectKind, List<FileReplacement>? fileReplacement = null)
     {
-        if (SemiTransientResources.ContainsKey(objectKind))
+        if (SemiTransientResources.TryGetValue(objectKind, out HashSet<string>? value))
         {
             if (fileReplacement == null)
             {
-                SemiTransientResources[objectKind].Clear();
+                value.Clear();
                 return;
             }
 
             foreach (var replacement in fileReplacement.Where(p => !p.HasFileReplacement).SelectMany(p => p.GamePaths).ToList())
             {
-                SemiTransientResources[objectKind].RemoveWhere(p => string.Equals(p, replacement, StringComparison.OrdinalIgnoreCase));
+                value.RemoveWhere(p => string.Equals(p, replacement, StringComparison.OrdinalIgnoreCase));
             }
         }
     }
@@ -97,17 +97,18 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
     {
         if (TransientResources.TryGetValue(gameObject, out var result))
         {
-            return result.ToList();
+            return [.. result];
         }
 
-        return new List<string>();
+        return [];
     }
 
     public void PersistTransientResources(IntPtr gameObject, ObjectKind objectKind)
     {
-        if (!SemiTransientResources.ContainsKey(objectKind))
+        if (!SemiTransientResources.TryGetValue(objectKind, out HashSet<string>? value))
         {
-            SemiTransientResources[objectKind] = new HashSet<string>(StringComparer.Ordinal);
+            value = new HashSet<string>(StringComparer.Ordinal);
+            SemiTransientResources[objectKind] = value;
         }
 
         if (!TransientResources.TryGetValue(gameObject, out var resources))
@@ -119,7 +120,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
         Logger.LogDebug("Persisting {count} transient resources", transientResources.Count);
         foreach (var gamePath in transientResources)
         {
-            SemiTransientResources[objectKind].Add(gamePath);
+            value.Add(gamePath);
         }
 
         if (objectKind == ObjectKind.Player && SemiTransientResources.TryGetValue(ObjectKind.Player, out var fileReplacements))
@@ -132,12 +133,13 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
     internal void AddSemiTransientResource(ObjectKind objectKind, string item)
     {
-        if (!SemiTransientResources.ContainsKey(objectKind))
+        if (!SemiTransientResources.TryGetValue(objectKind, out HashSet<string>? value))
         {
-            SemiTransientResources[objectKind] = new HashSet<string>(StringComparer.Ordinal);
+            value = new HashSet<string>(StringComparer.Ordinal);
+            SemiTransientResources[objectKind] = value;
         }
 
-        SemiTransientResources[objectKind].Add(item.ToLowerInvariant());
+        value.Add(item.ToLowerInvariant());
     }
 
     internal void ClearTransientPaths(IntPtr ptr, List<string> list)
@@ -154,9 +156,9 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
         TransientResources.Clear();
         SemiTransientResources.Clear();
-        if (SemiTransientResources.ContainsKey(ObjectKind.Player))
+        if (SemiTransientResources.TryGetValue(ObjectKind.Player, out HashSet<string>? value))
         {
-            _configurationService.Current.PlayerPersistentTransientCache[PlayerPersistentDataKey] = SemiTransientResources[ObjectKind.Player];
+            _configurationService.Current.PlayerPersistentTransientCache[PlayerPersistentDataKey] = value;
             _configurationService.Save();
         }
     }
@@ -182,7 +184,7 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
 
     private void Manager_PenumbraModSettingChanged()
     {
-        Task.Run(() =>
+        _ = Task.Run(() =>
         {
             Logger.LogDebug("Penumbra Mod Settings changed, verifying SemiTransientResources");
             foreach (var item in _playerRelatedPointers)
@@ -229,19 +231,20 @@ public sealed class TransientResourceManager : DisposableMediatorSubscriberBase
             return;
         }
 
-        if (!TransientResources.ContainsKey(gameObject))
+        if (!TransientResources.TryGetValue(gameObject, out HashSet<string>? value))
         {
-            TransientResources[gameObject] = new(StringComparer.OrdinalIgnoreCase);
+            value = new(StringComparer.OrdinalIgnoreCase);
+            TransientResources[gameObject] = value;
         }
 
-        if (TransientResources[gameObject].Contains(replacedGamePath) ||
+        if (value.Contains(replacedGamePath) ||
             SemiTransientResources.SelectMany(k => k.Value).Any(f => string.Equals(f, gamePath, StringComparison.OrdinalIgnoreCase)))
         {
             Logger.LogTrace("Not adding {replacedPath} : {filePath}", replacedGamePath, filePath);
         }
         else
         {
-            TransientResources[gameObject].Add(replacedGamePath);
+            value.Add(replacedGamePath);
             Logger.LogDebug("Adding {replacedGamePath} for {gameObject} ({filePath})", replacedGamePath, gameObject.ToString("X"), filePath);
             Mediator.Publish(new TransientResourceChangedMessage(gameObject));
         }

MareSynchronos/Interop/DalamudLogger.cs

@@ -8,8 +8,8 @@ namespace MareSynchronos.Interop;
 internal sealed class DalamudLogger : ILogger
 {
     private readonly MareConfigService _mareConfigService;
-    private readonly IPluginLog _pluginLog;
     private readonly string _name;
+    private readonly IPluginLog _pluginLog;
 
     public DalamudLogger(string name, MareConfigService mareConfigService, IPluginLog pluginLog)
     {

MareSynchronos/Interop/DalamudLoggingProvider.cs

@@ -1,8 +1,9 @@
-using System.Collections.Concurrent;
+using Dalamud.Plugin.Services;
-using Dalamud.Plugin.Services;
 using MareSynchronos.MareConfiguration;
 using Microsoft.Extensions.Logging;
 
+using System.Collections.Concurrent;
+
 namespace MareSynchronos.Interop;
 
 [ProviderAlias("Dalamud")]
@@ -32,7 +33,7 @@ public sealed class DalamudLoggingProvider : ILoggerProvider
             catName = string.Join("", Enumerable.Range(0, 15 - catName.Length).Select(_ => " ")) + catName;
         }
 
-        return _loggers.GetOrAdd(catName, name => new DalamudLogger(catName, _mareConfigService, _pluginLog));
+        return _loggers.GetOrAdd(catName, name => new DalamudLogger(name, _mareConfigService, _pluginLog));
     }
 
     public void Dispose()

MareSynchronos/Interop/IpcManager.cs

@@ -1,24 +1,22 @@
-using Dalamud.Plugin;
+using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Plugin.Ipc;
-using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
-using System.Collections.Concurrent;
+using Dalamud.Interface.Internal.Notifications;
-using System.Text;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Ipc;
+using Dalamud.Utility;
+using MareSynchronos.PlayerData.Handlers;
+using MareSynchronos.Services;
+using MareSynchronos.Services.Mediator;
+using Microsoft.Extensions.Logging;
 using Penumbra.Api.Enums;
 using Penumbra.Api.Helpers;
-using Dalamud.Interface.Internal.Notifications;
+using System.Collections.Concurrent;
-using Microsoft.Extensions.Logging;
+using System.Text;
-using MareSynchronos.PlayerData.Handlers;
-using MareSynchronos.Services.Mediator;
-using MareSynchronos.Services;
-using Dalamud.Utility;
 
 namespace MareSynchronos.Interop;
 
 public sealed class IpcManager : DisposableMediatorSubscriberBase
 {
-    private readonly uint LockCode = 0x6D617265;
-
     private readonly ICallGateSubscriber<(int, int)> _customizePlusApiVersion;
     private readonly ICallGateSubscriber<Character?, string?> _customizePlusGetBodyScale;
     private readonly ICallGateSubscriber<string?, string?, object> _customizePlusOnScaleUpdate;
@@ -51,6 +49,7 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
     private readonly FuncSubscriber<string, string, Dictionary<string, string>, string, int, PenumbraApiEc> _penumbraAddTemporaryMod;
     private readonly FuncSubscriber<(int, int)> _penumbraApiVersion;
     private readonly FuncSubscriber<string, int, bool, PenumbraApiEc> _penumbraAssignTemporaryCollection;
+    private readonly FuncSubscriber<string, string, TextureType, bool, Task> _penumbraConvertTextureFile;
     private readonly FuncSubscriber<string, PenumbraApiEc> _penumbraCreateNamedTemporaryCollection;
     private readonly EventSubscriber _penumbraDispose;
     private readonly FuncSubscriber<bool> _penumbraEnabled;
@@ -58,7 +57,6 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
     private readonly FuncSubscriber<string> _penumbraGetMetaManipulations;
     private readonly EventSubscriber _penumbraInit;
     private readonly EventSubscriber<ModSettingChange, string, string, bool> _penumbraModSettingChanged;
-    private readonly FuncSubscriber<string, string, TextureType, bool, Task> _penumbraConvertTextureFile;
     private readonly EventSubscriber<nint, int> _penumbraObjectIsRedrawn;
     private readonly ActionSubscriber<string, RedrawType> _penumbraRedraw;
     private readonly ActionSubscriber<GameObject, RedrawType> _penumbraRedrawObject;
@@ -69,6 +67,7 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
     private readonly FuncSubscriber<string[], string[], (string[], string[][])> _penumbraResolvePaths;
     private readonly ParamsFuncSubscriber<ushort, IReadOnlyDictionary<string, string[]>?[]> _penumbraResourcePaths;
     private readonly SemaphoreSlim _redrawSemaphore = new(2);
+    private readonly uint LockCode = 0x6D617265;
     private bool _customizePlusAvailable = false;
     private CancellationTokenSource _disposalCts = new();
     private bool _glamourerAvailable = false;
@@ -253,7 +252,6 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
                 {
                     logger.LogWarning("[{appid}] Failed to apply Glamourer data", applicationId);
                 }
-
             }).ConfigureAwait(false);
         }
         finally
@@ -262,52 +260,6 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
         }
     }
 
-    public async Task GlamourerRevert(ILogger logger, GameObjectHandler handler, Guid applicationId, CancellationToken token)
-    {
-        if ((!CheckGlamourerApi()) || _dalamudUtil.IsZoning) return;
-        try
-        {
-            await _redrawSemaphore.WaitAsync(token).ConfigureAwait(false);
-            await PenumbraRedrawInternalAsync(logger, handler, applicationId, (chara) =>
-            {
-                try
-                {
-                    logger.LogDebug("[{appid}] Calling On IPC: GlamourerUnlockName", applicationId);
-                    _glamourerUnlock.InvokeFunc(handler.Name, LockCode);
-                    logger.LogDebug("[{appid}] Calling On IPC: GlamourerRevert", applicationId);
-                    _glamourerRevert.InvokeAction(chara, LockCode);
-                    logger.LogDebug("[{appid}] Calling On IPC: PenumbraRedraw", applicationId);
-                    _penumbraRedrawObject.Invoke(chara, RedrawType.AfterGPose);
-                }
-                catch (Exception ex)
-                {
-                    logger.LogWarning(ex, "[{appid}] Error during GlamourerRevert", applicationId);
-                }
-
-            }).ConfigureAwait(false);
-        }
-        finally
-        {
-            _redrawSemaphore.Release();
-        }
-    }
-
-    public void GlamourerRevertByName(ILogger logger, string name, Guid applicationId)
-    {
-        if ((!CheckGlamourerApi()) || _dalamudUtil.IsZoning) return;
-        try
-        {
-            logger.LogDebug("[{appid}] Calling On IPC: GlamourerRevertByName", applicationId);
-            _glamourerRevertByName.InvokeAction(name, LockCode);
-            logger.LogDebug("[{appid}] Calling On IPC: GlamourerUnlockName", applicationId);
-            _glamourerUnlock.InvokeFunc(name, LockCode);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogWarning(ex, "Error during Glamourer RevertByName");
-        }
-    }
-
     public async Task<string> GlamourerGetCharacterCustomizationAsync(IntPtr character)
     {
         if (!CheckGlamourerApi()) return string.Empty;
@@ -334,6 +286,51 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
         }
     }
 
+    public async Task GlamourerRevert(ILogger logger, GameObjectHandler handler, Guid applicationId, CancellationToken token)
+    {
+        if ((!CheckGlamourerApi()) || _dalamudUtil.IsZoning) return;
+        try
+        {
+            await _redrawSemaphore.WaitAsync(token).ConfigureAwait(false);
+            await PenumbraRedrawInternalAsync(logger, handler, applicationId, (chara) =>
+            {
+                try
+                {
+                    logger.LogDebug("[{appid}] Calling On IPC: GlamourerUnlockName", applicationId);
+                    _glamourerUnlock.InvokeFunc(handler.Name, LockCode);
+                    logger.LogDebug("[{appid}] Calling On IPC: GlamourerRevert", applicationId);
+                    _glamourerRevert.InvokeAction(chara, LockCode);
+                    logger.LogDebug("[{appid}] Calling On IPC: PenumbraRedraw", applicationId);
+                    _penumbraRedrawObject.Invoke(chara, RedrawType.AfterGPose);
+                }
+                catch (Exception ex)
+                {
+                    logger.LogWarning(ex, "[{appid}] Error during GlamourerRevert", applicationId);
+                }
+            }).ConfigureAwait(false);
+        }
+        finally
+        {
+            _redrawSemaphore.Release();
+        }
+    }
+
+    public void GlamourerRevertByName(ILogger logger, string name, Guid applicationId)
+    {
+        if ((!CheckGlamourerApi()) || _dalamudUtil.IsZoning) return;
+        try
+        {
+            logger.LogDebug("[{appid}] Calling On IPC: GlamourerRevertByName", applicationId);
+            _glamourerRevertByName.InvokeAction(name, LockCode);
+            logger.LogDebug("[{appid}] Calling On IPC: GlamourerUnlockName", applicationId);
+            _glamourerUnlock.InvokeFunc(name, LockCode);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogWarning(ex, "Error during Glamourer RevertByName");
+        }
+    }
+
     public async Task HeelsRestoreOffsetForPlayerAsync(IntPtr character)
     {
         if (!CheckHeelsApi()) return;
@@ -469,6 +466,46 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
         }).ConfigureAwait(false);
     }
 
+    public async Task PenumbraConvertTextureFiles(ILogger logger, Dictionary<string, string[]> textures, IProgress<(string, int)> progress, CancellationToken token)
+    {
+        if (!CheckPenumbraApi()) return;
+
+        Mediator.Publish(new HaltScanMessage("TextureConversion"));
+        int currentTexture = 0;
+        foreach (var texture in textures)
+        {
+            if (token.IsCancellationRequested) break;
+
+            progress.Report((texture.Key, ++currentTexture));
+
+            logger.LogInformation("Converting Texture {path} to {type}", texture.Key, TextureType.Bc7Tex);
+            var convertTask = _penumbraConvertTextureFile.Invoke(texture.Key, texture.Key, TextureType.Bc7Tex, d: true);
+            await convertTask.ConfigureAwait(false);
+            if (convertTask.IsCompletedSuccessfully && texture.Value.Any())
+            {
+                foreach (var duplicatedTexture in texture.Value)
+                {
+                    logger.LogInformation("Migrating duplicate {dup}", duplicatedTexture);
+                    try
+                    {
+                        File.Copy(texture.Key, duplicatedTexture, overwrite: true);
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.LogError(ex, "Failed to copy duplicate {dup}", duplicatedTexture);
+                    }
+                }
+            }
+        }
+        Mediator.Publish(new ResumeScanMessage("TextureConversion"));
+
+        await _dalamudUtil.RunOnFrameworkThread(async () =>
+        {
+            var gameObject = await _dalamudUtil.CreateGameObjectAsync(await _dalamudUtil.GetPlayerPointerAsync().ConfigureAwait(false)).ConfigureAwait(false);
+            _penumbraRedrawObject.Invoke(gameObject!, RedrawType.Redraw);
+        }).ConfigureAwait(false);
+    }
+
     public async Task<string> PenumbraCreateTemporaryCollectionAsync(ILogger logger, string uid)
     {
         if (!CheckPenumbraApi()) return string.Empty;
@@ -482,6 +519,19 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
         }).ConfigureAwait(false);
     }
 
+    public async Task<IReadOnlyDictionary<string, string[]>?[]?> PenumbraGetCharacterData(ILogger logger, GameObjectHandler handler)
+    {
+        if (!CheckPenumbraApi()) return null;
+
+        return await _dalamudUtil.RunOnFrameworkThread(() =>
+        {
+            logger.LogTrace("Calling On IPC: Penumbra.GetGameObjectResourcePaths");
+            var idx = handler.GetGameObject()?.ObjectIndex;
+            if (idx == null) return null;
+            return _penumbraResourcePaths.Invoke(idx.Value);
+        }).ConfigureAwait(false);
+    }
+
     public string PenumbraGetMetaManipulations()
     {
         if (!CheckPenumbraApi()) return string.Empty;
@@ -529,7 +579,7 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
         await _dalamudUtil.RunOnFrameworkThread(() =>
         {
             logger.LogTrace("[{applicationId}] Manip: {data}", applicationId, manipulationData);
-            var retAdd = _penumbraAddTemporaryMod.Invoke("MareChara_Meta", collName, new Dictionary<string, string>(), manipulationData, 0);
+            var retAdd = _penumbraAddTemporaryMod.Invoke("MareChara_Meta", collName, [], manipulationData, 0);
             logger.LogTrace("[{applicationId}] Setting temp meta mod for {collName}, Success: {ret}", applicationId, collName, retAdd);
         }).ConfigureAwait(false);
     }
@@ -551,59 +601,6 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
         }).ConfigureAwait(false);
     }
 
-    public async Task PenumbraConvertTextureFiles(ILogger logger, Dictionary<string, string[]> textures, IProgress<(string, int)> progress, CancellationToken token)
-    {
-        if (!CheckPenumbraApi()) return;
-
-        Mediator.Publish(new HaltScanMessage("TextureConversion"));
-        int currentTexture = 0;
-        foreach (var texture in textures)
-        {
-            if (token.IsCancellationRequested) break;
-
-            progress.Report((texture.Key, ++currentTexture));
-
-            logger.LogInformation("Converting Texture {path} to {type}", texture.Key, TextureType.Bc7Tex);
-            var convertTask = _penumbraConvertTextureFile.Invoke(texture.Key, texture.Key, TextureType.Bc7Tex, true);
-            await convertTask.ConfigureAwait(false);
-            if (convertTask.IsCompletedSuccessfully && texture.Value.Any())
-            {
-                foreach (var duplicatedTexture in texture.Value)
-                {
-                    logger.LogInformation("Migrating duplicate {dup}", duplicatedTexture);
-                    try
-                    {
-                        File.Copy(texture.Key, duplicatedTexture, true);
-                    }
-                    catch (Exception ex)
-                    {
-                        logger.LogError(ex, "Failed to copy duplicate {dup}", duplicatedTexture);
-                    }
-                }
-            }
-        }
-        Mediator.Publish(new ResumeScanMessage("TextureConversion"));
-
-        await _dalamudUtil.RunOnFrameworkThread(async () =>
-        {
-            var gameObject = await _dalamudUtil.CreateGameObjectAsync(await _dalamudUtil.GetPlayerPointerAsync().ConfigureAwait(false)).ConfigureAwait(false);
-            _penumbraRedrawObject.Invoke(gameObject!, RedrawType.Redraw);
-        }).ConfigureAwait(false);
-    }
-
-    public async Task<IReadOnlyDictionary<string, string[]>?[]?> PenumbraGetCharacterData(ILogger logger, GameObjectHandler handler)
-    {
-        if (!CheckPenumbraApi()) return null;
-
-        return await _dalamudUtil.RunOnFrameworkThread(() =>
-        {
-            logger.LogTrace("Calling On IPC: Penumbra.GetGameObjectResourcePaths");
-            var idx = handler.GetGameObject()?.ObjectIndex;
-            if (idx == null) return null;
-            return _penumbraResourcePaths.Invoke(idx.Value);
-        }).ConfigureAwait(false);
-    }
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);

MareSynchronos/Interop/Structs.cs

@@ -3,7 +3,7 @@ using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
 using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
 
 namespace MareSynchronos.Interop;
-
+#pragma warning disable MA0048
 [StructLayout(LayoutKind.Explicit)]
 public unsafe struct RenderModel
 {
@@ -25,7 +25,6 @@ public unsafe struct RenderModel
     [FieldOffset(0x60)]
     public int BoneListCount;
 
-
     [FieldOffset(0x98)]
     public void** Materials;
 
@@ -47,3 +46,4 @@ public unsafe struct WeaponDrawObject
 {
     [FieldOffset(0x00)] public RenderModel* RenderModel;
 }
+#pragma warning restore MA0048

MareSynchronos/Localization/Strings.cs

@@ -4,11 +4,14 @@ namespace MareSynchronos.Localization;
 
 public static class Strings
 {
+    public static ToSStrings ToS { get; set; } = new();
+
     public class ToSStrings
     {
-        public readonly string LanguageLabel = Loc.Localize("LanguageLabel", "Language");
+        public readonly string AgreeLabel = Loc.Localize("AgreeLabel", "I agree");
         public readonly string AgreementLabel = Loc.Localize("AgreementLabel", "Agreement of Usage of Service");
-        public readonly string ReadLabel = Loc.Localize("ReadLabel", "READ THIS CAREFULLY");
+        public readonly string ButtonWillBeAvailableIn = Loc.Localize("ButtonWillBeAvailableIn", "'I agree' button will be available in");
+        public readonly string LanguageLabel = Loc.Localize("LanguageLabel", "Language");
 
         public readonly string Paragraph1 = Loc.Localize("Paragraph1",
             "All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. " +
@@ -36,10 +39,6 @@ public static class Strings
         public readonly string Paragraph6 = Loc.Localize("Paragraph6",
             "This service is provided as-is. In case of abuse join the Mare Synchronos Discord.");
 
-        public readonly string AgreeLabel = Loc.Localize("AgreeLabel", "I agree");
+        public readonly string ReadLabel = Loc.Localize("ReadLabel", "READ THIS CAREFULLY");
-
-        public readonly string ButtonWillBeAvailableIn = Loc.Localize("ButtonWillBeAvailableIn", "'I agree' button will be available in");
     }
-
-    public static ToSStrings ToS { get; set; } = new();
 }

MareSynchronos/MareConfiguration/ConfigurationMigrator.cs

@@ -1,74 +1,16 @@
 using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration.Configurations;
-using MareSynchronos.MareConfiguration.Configurations.Obsolete;
-using MareSynchronos.MareConfiguration.Models;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace MareSynchronos.MareConfiguration;
-#pragma warning disable CS0618 // ignore Obsolete tag, the point of this migrator is to migrate obsolete configs to new ones
-#pragma warning disable CS0612 // ignore Obsolete tag, the point of this migrator is to migrate obsolete configs to new ones
 
-public class ConfigurationMigrator : IHostedService
+public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, DalamudPluginInterface pi) : IHostedService
 {
-    private readonly ILogger<ConfigurationMigrator> _logger;
-    private readonly DalamudPluginInterface _pi;
-
-    public ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, DalamudPluginInterface pi)
-    {
-        _logger = logger;
-        _pi = pi;
-    }
-
     public void Migrate()
     {
-        if (_pi.GetPluginConfig() is Configurations.Obsolete.Configuration oldConfig)
+        // currently nothing to migrate
-        {
-            _logger.LogInformation("Migrating Configuration from old config style to 1");
-
-            var config = oldConfig.ToMareConfig(_logger);
-            File.Move(_pi.ConfigFile.FullName, _pi.ConfigFile.FullName + ".old", overwrite: true);
-            MigrateMareConfigV0ToV1(config);
-        }
-
-        if (File.Exists(ConfigurationPath(MareConfigService.ConfigName)))
-        {
-            try
-            {
-                var mareConfig = JsonConvert.DeserializeObject<MareConfigV0>(File.ReadAllText(ConfigurationPath(MareConfigService.ConfigName)))!;
-
-                if (mareConfig.Version == 0)
-                {
-                    MigrateMareConfigV0ToV1(mareConfig);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Failed to migrate, skipping");
-            }
-        }
-
-        if (File.Exists(ConfigurationPath(ServerConfigService.ConfigName)))
-        {
-            try
-            {
-                var content = File.ReadAllText(ConfigurationPath(ServerConfigService.ConfigName));
-                if (!content.Contains("\"Version\": 1"))
-                {
-                    var serverConfig = JsonConvert.DeserializeObject<ServerConfigV0>(content);
-
-                    if (serverConfig != null && serverConfig.Version == 0)
-                    {
-                        MigrateServerConfigV0toV1(serverConfig);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex,"Failed to migrate ServerConfig");
-            }
-        }
     }
 
     public Task StartAsync(CancellationToken cancellationToken)
@@ -87,74 +29,5 @@ public class ConfigurationMigrator : IHostedService
         File.WriteAllText(path, JsonConvert.SerializeObject(config, Formatting.Indented));
     }
 
-    private string ConfigurationPath(string configName) => Path.Combine(_pi.ConfigDirectory.FullName, configName);
+    private string ConfigurationPath(string configName) => Path.Combine(pi.ConfigDirectory.FullName, configName);
-
-    private void MigrateMareConfigV0ToV1(MareConfigV0 mareConfigV0)
-    {
-        _logger.LogInformation("Migrating Configuration from version 0 to 1");
-        if (File.Exists(ConfigurationPath(MareConfigService.ConfigName)))
-            File.Copy(ConfigurationPath(MareConfigService.ConfigName), ConfigurationPath(MareConfigService.ConfigName) + ".migrated." + mareConfigV0.Version + ".bak", overwrite: true);
-
-        MareConfig mareConfigV1 = mareConfigV0.ToV1();
-
-        var serverConfig = new ServerConfig()
-        {
-            ServerStorage = mareConfigV0.ServerStorage.Select(p => p.Value.ToV1()).ToList()
-        };
-        serverConfig.CurrentServer = Array.IndexOf(serverConfig.ServerStorage.Select(s => s.ServerUri).ToArray(), mareConfigV0.CurrentServer);
-        var transientConfig = new TransientConfig()
-        {
-            PlayerPersistentTransientCache = mareConfigV0.PlayerPersistentTransientCache
-        };
-        var tagConfig = new ServerTagConfig()
-        {
-            ServerTagStorage = mareConfigV0.ServerStorage.ToDictionary(p => p.Key, p => new ServerTagStorage()
-            {
-                UidServerPairedUserTags = p.Value.UidServerPairedUserTags.ToDictionary(p => p.Key, p => p.Value.ToList(), StringComparer.Ordinal),
-                OpenPairTags = p.Value.OpenPairTags.ToHashSet(StringComparer.Ordinal),
-                ServerAvailablePairTags = p.Value.ServerAvailablePairTags.ToHashSet(StringComparer.Ordinal)
-            }, StringComparer.Ordinal)
-        };
-        var notesConfig = new UidNotesConfig()
-        {
-            ServerNotes = mareConfigV0.ServerStorage.ToDictionary(p => p.Key, p => new ServerNotesStorage()
-            {
-                GidServerComments = p.Value.GidServerComments,
-                UidServerComments = p.Value.UidServerComments
-            }, StringComparer.Ordinal)
-        };
-
-        SaveConfig(mareConfigV1, ConfigurationPath(MareConfigService.ConfigName));
-        SaveConfig(serverConfig, ConfigurationPath(ServerConfigService.ConfigName));
-        SaveConfig(transientConfig, ConfigurationPath(TransientConfigService.ConfigName));
-        SaveConfig(tagConfig, ConfigurationPath(ServerTagConfigService.ConfigName));
-        SaveConfig(notesConfig, ConfigurationPath(NotesConfigService.ConfigName));
-    }
-
-    private void MigrateServerConfigV0toV1(ServerConfigV0 serverConfigV0)
-    {
-        _logger.LogInformation("Migration Server Configuration from version 0 to 1");
-        if (File.Exists(ConfigurationPath(ServerConfigService.ConfigName)))
-            File.Copy(ConfigurationPath(ServerConfigService.ConfigName), ConfigurationPath(ServerConfigService.ConfigName) + ".migrated." + serverConfigV0.Version + ".bak", overwrite: true);
-
-        ServerConfig migrated = new();
-
-        var currentServer = serverConfigV0.CurrentServer;
-        var currentServerIdx = Array.IndexOf(serverConfigV0.ServerStorage.Keys.ToArray(), currentServer);
-
-        if (currentServerIdx == -1) currentServerIdx = 0;
-
-        migrated.CurrentServer = currentServerIdx;
-        migrated.ServerStorage = new();
-
-        foreach (var server in serverConfigV0.ServerStorage)
-        {
-            migrated.ServerStorage.Add(server.Value);
-        }
-
-        SaveConfig(migrated, ConfigurationPath(ServerConfigService.ConfigName));
-    }
 }
-
-#pragma warning restore CS0612 // ignore Obsolete tag, the point of this migrator is to migrate obsolete configs to new ones
-#pragma warning restore CS0618 // ignore Obsolete tag, the point of this migrator is to migrate obsolete configs to new ones

MareSynchronos/MareConfiguration/ConfigurationServiceBase.cs

@@ -14,8 +14,8 @@ public abstract class ConfigurationServiceBase<T> : IDisposable where T : IMareC
     {
         ConfigurationDirectory = configurationDirectory;
 
-        Task.Run(CheckForConfigUpdatesInternal, _periodicCheckCts.Token);
+        _ = Task.Run(CheckForConfigUpdatesInternal, _periodicCheckCts.Token);
-        Task.Run(CheckForDirtyConfigInternal, _periodicCheckCts.Token);
+        _ = Task.Run(CheckForDirtyConfigInternal, _periodicCheckCts.Token);
 
         _currentConfigInternal = LazyConfig();
     }

MareSynchronos/MareConfiguration/Configurations/MareConfig.cs

@@ -9,8 +9,8 @@ public class MareConfig : IMareConfiguration
     public bool AcceptedAgreement { get; set; } = false;
     public string CacheFolder { get; set; } = string.Empty;
     public bool DisableOptionalPluginWarnings { get; set; } = false;
-    public bool EnableRightClickMenus { get; set; } = true;
     public bool EnableDtrEntry { get; set; } = false;
+    public bool EnableRightClickMenus { get; set; } = true;
     public NotificationLocation ErrorNotification { get; set; } = NotificationLocation.Both;
     public string ExportFolder { get; set; } = string.Empty;
     public bool FileScanPaused { get; set; } = false;
@@ -22,15 +22,14 @@ public class MareConfig : IMareConfiguration
     public bool OpenGposeImportOnGposeStart { get; set; } = false;
     public bool OpenPopupOnAdd { get; set; } = true;
     public int ParallelDownloads { get; set; } = 10;
-    public bool UseCompactor { get; set; } = false;
+    public bool PreferNotesOverNamesForVisible { get; set; } = false;
     public float ProfileDelay { get; set; } = 1.5f;
     public bool ProfilePopoutRight { get; set; } = false;
     public bool ProfilesAllowNsfw { get; set; } = false;
     public bool ProfilesShow { get; set; } = true;
-    public bool ReverseUserSort { get; set; } = false;
     public bool ShowCharacterNameInsteadOfNotesForVisible { get; set; } = false;
-    public bool PreferNotesOverNamesForVisible { get; set; } = false;
     public bool ShowOfflineUsersSeparately { get; set; } = true;
+    public bool GroupUpSyncshells { get; set; } = true;
     public bool ShowOnlineNotifications { get; set; } = false;
     public bool ShowOnlineNotificationsOnlyForIndividualPairs { get; set; } = true;
     public bool ShowOnlineNotificationsOnlyForNamedPairs { get; set; } = false;
@@ -44,6 +43,7 @@ public class MareConfig : IMareConfiguration
     public bool TransferBarsShowText { get; set; } = true;
     public int TransferBarsWidth { get; set; } = 250;
     public bool UseAlternativeFileUpload { get; set; } = false;
+    public bool UseCompactor { get; set; } = false;
     public int Version { get; set; } = 1;
     public NotificationLocation WarningNotification { get; set; } = NotificationLocation.Both;
 }

MareSynchronos/MareConfiguration/Configurations/Obsolete/Configuration.cs

@@ -1,124 +0,0 @@
-using Dalamud.Configuration;
-using MareSynchronos.MareConfiguration.Models;
-using MareSynchronos.MareConfiguration.Models.Obsolete;
-using MareSynchronos.WebAPI;
-using Microsoft.Extensions.Logging;
-
-namespace MareSynchronos.MareConfiguration.Configurations.Obsolete;
-
-[Serializable]
-[Obsolete("Deprecated, use MareConfig")]
-public class Configuration : IPluginConfiguration
-{
-    public int Version { get; set; } = 6;
-    public Dictionary<string, ServerStorageV0> ServerStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase)
-    {
-        { ApiController.MainServiceUri, new ServerStorageV0() { ServerName = ApiController.MainServer, ServerUri = ApiController.MainServiceUri } },
-    };
-    public bool AcceptedAgreement { get; set; } = false;
-    public string CacheFolder { get; set; } = string.Empty;
-    public double MaxLocalCacheInGiB { get; set; } = 20;
-    public bool ReverseUserSort { get; set; } = false;
-    public int TimeSpanBetweenScansInSeconds { get; set; } = 30;
-    public bool FileScanPaused { get; set; } = false;
-    public bool InitialScanComplete { get; set; } = false;
-    public bool FullPause { get; set; } = false;
-    public bool HideInfoMessages { get; set; } = false;
-    public bool DisableOptionalPluginWarnings { get; set; } = false;
-    public bool OpenGposeImportOnGposeStart { get; set; } = false;
-    public bool ShowTransferWindow { get; set; } = true;
-    public bool OpenPopupOnAdd { get; set; } = true;
-    public string CurrentServer { get; set; } = string.Empty;
-
-    private string _apiUri = string.Empty;
-    public string ApiUri
-    {
-        get => string.IsNullOrEmpty(_apiUri) ? ApiController.MainServiceUri : _apiUri;
-        set => _apiUri = value;
-    }
-    public Dictionary<string, string> ClientSecret { get; set; } = new(StringComparer.Ordinal);
-    public Dictionary<string, string> CustomServerList { get; set; } = new(StringComparer.Ordinal);
-    public Dictionary<string, Dictionary<string, string>> UidServerComments { get; set; } = new(StringComparer.Ordinal);
-    public Dictionary<string, Dictionary<string, string>> GidServerComments { get; set; } = new(StringComparer.Ordinal);
-    /// <summary>
-    /// Each paired user can have multiple tags. Each tag will create a category, and the user will
-    /// be displayed into that category.
-    /// The dictionary first maps a server URL to a dictionary, and that
-    /// dictionary maps the OtherUID of the <see cref="ClientPairDto"/> to a list of tags.
-    /// </summary>
-    public Dictionary<string, Dictionary<string, List<string>>> UidServerPairedUserTags { get; set; } = new(StringComparer.Ordinal);
-    /// <summary>
-    /// A dictionary that maps a server URL to the tags the user has added for that server.
-    /// </summary>
-    public Dictionary<string, HashSet<string>> ServerAvailablePairTags { get; set; } = new(StringComparer.Ordinal);
-    public HashSet<string> OpenPairTags { get; set; } = new(StringComparer.Ordinal);
-
-    public MareConfigV0 ToMareConfig(ILogger logger)
-    {
-
-        MareConfigV0 newConfig = new();
-        logger.LogInformation("Migrating Config to MareConfig");
-
-        newConfig.AcceptedAgreement = AcceptedAgreement;
-        newConfig.CacheFolder = CacheFolder;
-        newConfig.MaxLocalCacheInGiB = MaxLocalCacheInGiB;
-        newConfig.ReverseUserSort = ReverseUserSort;
-        newConfig.TimeSpanBetweenScansInSeconds = TimeSpanBetweenScansInSeconds;
-        newConfig.FileScanPaused = FileScanPaused;
-        newConfig.InitialScanComplete = InitialScanComplete;
-        newConfig.DisableOptionalPluginWarnings = DisableOptionalPluginWarnings;
-        newConfig.OpenGposeImportOnGposeStart = OpenGposeImportOnGposeStart;
-        newConfig.ShowTransferWindow = ShowTransferWindow;
-        newConfig.OpenPopupOnAdd = OpenPopupOnAdd;
-        newConfig.CurrentServer = ApiUri;
-
-        // create all server storage based on current clientsecret
-        foreach (var secret in ClientSecret)
-        {
-            logger.LogDebug("Migrating {key}", secret.Key);
-            var apiuri = secret.Key;
-            var secretkey = secret.Value;
-            ServerStorageV0 toAdd = new();
-            if (string.Equals(apiuri, ApiController.MainServiceUri, StringComparison.OrdinalIgnoreCase))
-            {
-                toAdd.ServerUri = ApiController.MainServiceUri;
-                toAdd.ServerName = ApiController.MainServer;
-            }
-            else
-            {
-                toAdd.ServerUri = apiuri;
-                if (!CustomServerList.TryGetValue(apiuri, out var serverName)) serverName = apiuri;
-                toAdd.ServerName = serverName;
-            }
-
-            toAdd.SecretKeys[0] = new SecretKey()
-            {
-                FriendlyName = "Auto Migrated Secret Key (" + DateTime.Now.ToString("yyyy-MM-dd") + ")",
-                Key = secretkey,
-            };
-
-            if (GidServerComments.TryGetValue(apiuri, out var gids))
-            {
-                toAdd.GidServerComments = gids;
-            }
-            if (UidServerComments.TryGetValue(apiuri, out var uids))
-            {
-                toAdd.UidServerComments = uids;
-            }
-            if (UidServerPairedUserTags.TryGetValue(apiuri, out var uidtag))
-            {
-                toAdd.UidServerPairedUserTags = uidtag;
-            }
-            if (ServerAvailablePairTags.TryGetValue(apiuri, out var servertag))
-            {
-                toAdd.ServerAvailablePairTags = servertag;
-            }
-            toAdd.OpenPairTags = OpenPairTags;
-            toAdd.FullPause = FullPause;
-
-            newConfig.ServerStorage[apiuri] = toAdd;
-        }
-
-        return newConfig;
-    }
-}

MareSynchronos/MareConfiguration/Configurations/Obsolete/MareConfigV0.cs

@@ -1,57 +0,0 @@
-using MareSynchronos.MareConfiguration.Models;
-using MareSynchronos.MareConfiguration.Models.Obsolete;
-
-namespace MareSynchronos.MareConfiguration.Configurations.Obsolete;
-
-[Serializable]
-[Obsolete("Deprecated, use MareConfig")]
-public class MareConfigV0 : IMareConfiguration
-{
-    public int Version { get; set; } = 0;
-    public Dictionary<string, ServerStorageV0> ServerStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase);
-    public Dictionary<string, HashSet<string>> PlayerPersistentTransientCache { get; set; } = new(StringComparer.Ordinal);
-    public bool AcceptedAgreement { get; set; } = false;
-    public string CacheFolder { get; set; } = string.Empty;
-    public double MaxLocalCacheInGiB { get; set; } = 20;
-    public bool ReverseUserSort { get; set; } = false;
-    public int TimeSpanBetweenScansInSeconds { get; set; } = 30;
-    public bool FileScanPaused { get; set; } = false;
-    public bool InitialScanComplete { get; set; } = false;
-    public bool DisableOptionalPluginWarnings { get; set; } = false;
-    public bool OpenGposeImportOnGposeStart { get; set; } = false;
-    public bool ShowTransferWindow { get; set; } = true;
-    public bool OpenPopupOnAdd { get; set; } = true;
-    public string CurrentServer { get; set; } = string.Empty;
-    public bool ShowOnlineNotifications { get; set; } = false;
-    public bool ShowOnlineNotificationsOnlyForIndividualPairs { get; set; } = true;
-    public bool ShowOnlineNotificationsOnlyForNamedPairs { get; set; } = false;
-    public bool ShowCharacterNameInsteadOfNotesForVisible { get; set; } = false;
-    public NotificationLocation InfoNotification { get; set; } = NotificationLocation.Toast;
-    public NotificationLocation WarningNotification { get; set; } = NotificationLocation.Both;
-    public NotificationLocation ErrorNotification { get; set; } = NotificationLocation.Both;
-
-    public MareConfig ToV1()
-    {
-        return new MareConfig()
-        {
-            AcceptedAgreement = this.AcceptedAgreement,
-            CacheFolder = this.CacheFolder,
-            MaxLocalCacheInGiB = this.MaxLocalCacheInGiB,
-            ReverseUserSort = this.ReverseUserSort,
-            TimeSpanBetweenScansInSeconds = this.TimeSpanBetweenScansInSeconds,
-            FileScanPaused = this.FileScanPaused,
-            InitialScanComplete = this.InitialScanComplete,
-            DisableOptionalPluginWarnings = this.DisableOptionalPluginWarnings,
-            OpenGposeImportOnGposeStart = this.OpenGposeImportOnGposeStart,
-            ShowTransferWindow = this.ShowTransferWindow,
-            OpenPopupOnAdd = this.OpenPopupOnAdd,
-            ShowOnlineNotifications = this.ShowOnlineNotifications,
-            ShowOnlineNotificationsOnlyForIndividualPairs = this.ShowOnlineNotificationsOnlyForIndividualPairs,
-            ShowCharacterNameInsteadOfNotesForVisible = this.ShowCharacterNameInsteadOfNotesForVisible,
-            ShowOnlineNotificationsOnlyForNamedPairs = this.ShowOnlineNotificationsOnlyForNamedPairs,
-            ErrorNotification = this.ErrorNotification,
-            InfoNotification = this.InfoNotification,
-            WarningNotification = this.WarningNotification,
-        };
-    }
-}

MareSynchronos/MareConfiguration/Configurations/Obsolete/ServerConfigV0.cs

@@ -1,18 +0,0 @@
-using MareSynchronos.MareConfiguration.Models;
-using MareSynchronos.WebAPI;
-
-namespace MareSynchronos.MareConfiguration.Configurations.Obsolete;
-
-[Serializable]
-[Obsolete("Replaced with ServerConfig")]
-public class ServerConfigV0 : IMareConfiguration
-{
-    public string CurrentServer { get; set; } = string.Empty;
-
-    public Dictionary<string, ServerStorage> ServerStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase)
-    {
-        { ApiController.MainServiceUri, new ServerStorage() { ServerName = ApiController.MainServer, ServerUri = ApiController.MainServiceUri } },
-    };
-
-    public int Version { get; set; } = 0;
-}

MareSynchronos/MareConfiguration/Configurations/ServerTagConfig.cs

@@ -4,6 +4,6 @@ namespace MareSynchronos.MareConfiguration.Configurations;
 
 public class ServerTagConfig : IMareConfiguration
 {
-    public int Version { get; set; } = 0;
     public Dictionary<string, ServerTagStorage> ServerTagStorage { get; set; } = new(StringComparer.OrdinalIgnoreCase);
-}
+    public int Version { get; set; } = 0;
+}

MareSynchronos/MareConfiguration/Configurations/TransientConfig.cs

@@ -2,8 +2,6 @@
 
 public class TransientConfig : IMareConfiguration
 {
-    public int Version { get; set; } = 0;
-
     public Dictionary<string, HashSet<string>> PlayerPersistentTransientCache { get; set; } = new(StringComparer.Ordinal);
-
+    public int Version { get; set; } = 0;
 }

MareSynchronos/MareConfiguration/Configurations/UidNotesConfig.cs

@@ -4,6 +4,6 @@ namespace MareSynchronos.MareConfiguration.Configurations;
 
 public class UidNotesConfig : IMareConfiguration
 {
-    public int Version { get; set; } = 0;
     public Dictionary<string, ServerNotesStorage> ServerNotes { get; set; } = new(StringComparer.Ordinal);
-}
+    public int Version { get; set; } = 0;
+}

MareSynchronos/MareConfiguration/Models/Authentication.cs

@@ -6,4 +6,4 @@ public record Authentication
     public string CharacterName { get; set; } = string.Empty;
     public uint WorldId { get; set; } = 0;
     public int SecretKeyIdx { get; set; } = -1;
-}
+}

MareSynchronos/MareConfiguration/Models/Obsolete/ServerStorageV0.cs

@@ -4,16 +4,16 @@
 [Obsolete("Deprecated, use ServerStorage")]
 public class ServerStorageV0
 {
-    public string ServerUri { get; set; } = string.Empty;
+    public List<Authentication> Authentications { get; set; } = [];
-    public string ServerName { get; set; } = string.Empty;
-    public List<Authentication> Authentications { get; set; } = new();
-    public Dictionary<string, string> UidServerComments { get; set; } = new(StringComparer.Ordinal);
-    public Dictionary<string, string> GidServerComments { get; set; } = new(StringComparer.Ordinal);
-    public Dictionary<string, List<string>> UidServerPairedUserTags { get; set; } = new(StringComparer.Ordinal);
-    public HashSet<string> ServerAvailablePairTags { get; set; } = new(StringComparer.Ordinal);
-    public HashSet<string> OpenPairTags { get; set; } = new(StringComparer.Ordinal);
-    public Dictionary<int, SecretKey> SecretKeys { get; set; } = new();
     public bool FullPause { get; set; } = false;
+    public Dictionary<string, string> GidServerComments { get; set; } = new(StringComparer.Ordinal);
+    public HashSet<string> OpenPairTags { get; set; } = new(StringComparer.Ordinal);
+    public Dictionary<int, SecretKey> SecretKeys { get; set; } = [];
+    public HashSet<string> ServerAvailablePairTags { get; set; } = new(StringComparer.Ordinal);
+    public string ServerName { get; set; } = string.Empty;
+    public string ServerUri { get; set; } = string.Empty;
+    public Dictionary<string, string> UidServerComments { get; set; } = new(StringComparer.Ordinal);
+    public Dictionary<string, List<string>> UidServerPairedUserTags { get; set; } = new(StringComparer.Ordinal);
 
     public ServerStorage ToV1()
     {
@@ -21,9 +21,9 @@ public class ServerStorageV0
         {
             ServerUri = ServerUri,
             ServerName = ServerName,
-            Authentications = Authentications.ToList(),
+            Authentications = [.. Authentications],
             FullPause = FullPause,
             SecretKeys = SecretKeys.ToDictionary(p => p.Key, p => p.Value)
         };
     }
-}
+}

MareSynchronos/MareConfiguration/Models/SecretKey.cs

@@ -3,6 +3,6 @@
 [Serializable]
 public class SecretKey
 {
-    public string Key { get; set; } = string.Empty;
     public string FriendlyName { get; set; } = string.Empty;
-}
+    public string Key { get; set; } = string.Empty;
+}

MareSynchronos/MareConfiguration/Models/ServerNotesStorage.cs

@@ -2,6 +2,6 @@
 
 public class ServerNotesStorage
 {
-    public Dictionary<string, string> UidServerComments { get; set; } = new(StringComparer.Ordinal);
     public Dictionary<string, string> GidServerComments { get; set; } = new(StringComparer.Ordinal);
-}
+    public Dictionary<string, string> UidServerComments { get; set; } = new(StringComparer.Ordinal);
+}

MareSynchronos/MareConfiguration/Models/ServerStorage.cs

@@ -3,9 +3,9 @@
 [Serializable]
 public class ServerStorage
 {
-    public string ServerUri { get; set; } = string.Empty;
+    public List<Authentication> Authentications { get; set; } = [];
-    public string ServerName { get; set; } = string.Empty;
-    public List<Authentication> Authentications { get; set; } = new();
-    public Dictionary<int, SecretKey> SecretKeys { get; set; } = new();
     public bool FullPause { get; set; } = false;
-}
+    public Dictionary<int, SecretKey> SecretKeys { get; set; } = [];
+    public string ServerName { get; set; } = string.Empty;
+    public string ServerUri { get; set; } = string.Empty;
+}

MareSynchronos/MareConfiguration/Models/ServerTagStorage.cs

@@ -3,7 +3,7 @@
 [Serializable]
 public class ServerTagStorage
 {
-    public Dictionary<string, List<string>> UidServerPairedUserTags { get; set; } = new(StringComparer.Ordinal);
-    public HashSet<string> ServerAvailablePairTags { get; set; } = new(StringComparer.Ordinal);
     public HashSet<string> OpenPairTags { get; set; } = new(StringComparer.Ordinal);
-}
+    public HashSet<string> ServerAvailablePairTags { get; set; } = new(StringComparer.Ordinal);
+    public Dictionary<string, List<string>> UidServerPairedUserTags { get; set; } = new(StringComparer.Ordinal);
+}

MareSynchronos/MarePlugin.cs

@@ -90,7 +90,7 @@ public class MarePlugin : MediatorSubscriberBase, IHostedService
         var version = Assembly.GetExecutingAssembly().GetName().Version!;
         Logger.LogInformation("Launching {name} {major}.{minor}.{build}", "Mare Synchronos", version.Major, version.Minor, version.Build);
 
-        Mediator.Subscribe<SwitchToMainUiMessage>(this, (_) => Task.Run(WaitForPlayerAndLaunchCharacterManager));
+        Mediator.Subscribe<SwitchToMainUiMessage>(this, (msg) => _ = Task.Run(WaitForPlayerAndLaunchCharacterManager));
         Mediator.Subscribe<DalamudLoginMessage>(this, (_) => DalamudUtilOnLogIn());
         Mediator.Subscribe<DalamudLogoutMessage>(this, (_) => DalamudUtilOnLogOut());
 
@@ -112,7 +112,7 @@ public class MarePlugin : MediatorSubscriberBase, IHostedService
     {
         Logger?.LogDebug("Client login");
 
-        Task.Run(WaitForPlayerAndLaunchCharacterManager);
+        _ = Task.Run(WaitForPlayerAndLaunchCharacterManager);
     }
 
     private void DalamudUtilOnLogOut()

MareSynchronos/MareSynchronos.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>1.8.0</Version>
+    <Version>1.9.0</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
@@ -46,6 +46,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.32.1" />
   </ItemGroup>
 
   <PropertyGroup>

MareSynchronos/PlayerData/Data/CharacterData.cs

@@ -1,15 +1,17 @@
-using System.Text;
+using MareSynchronos.API.Data;
+
 using MareSynchronos.API.Data.Enum;
-using MareSynchronos.API.Data;
+
+using System.Text;
 
 namespace MareSynchronos.PlayerData.Data;
 
 public class CharacterData
 {
-    public Dictionary<ObjectKind, string> CustomizePlusScale { get; set; } = new();
+    public Dictionary<ObjectKind, string> CustomizePlusScale { get; set; } = [];
-    public Dictionary<ObjectKind, HashSet<FileReplacement>> FileReplacements { get; set; } = new();
+    public Dictionary<ObjectKind, HashSet<FileReplacement>> FileReplacements { get; set; } = [];
 
-    public Dictionary<ObjectKind, string> GlamourerString { get; set; } = new();
+    public Dictionary<ObjectKind, string> GlamourerString { get; set; } = [];
 
     public string HeelsData { get; set; } = string.Empty;
     public string HonorificData { get; set; } = string.Empty;

MareSynchronos/PlayerData/Data/FileReplacement.cs

@@ -1,5 +1,6 @@
-using System.Text.RegularExpressions;
+using MareSynchronos.API.Data;
-using MareSynchronos.API.Data;
+
+using System.Text.RegularExpressions;
 
 namespace MareSynchronos.PlayerData.Data;
 
@@ -23,7 +24,7 @@ public partial class FileReplacement
     {
         return new FileReplacementData
         {
-            GamePaths = GamePaths.ToArray(),
+            GamePaths = [.. GamePaths],
             Hash = Hash,
             FileSwapPath = IsFileSwap ? ResolvedPath : string.Empty,
         };

MareSynchronos/PlayerData/Data/PlayerChanges.cs

@@ -9,4 +9,4 @@ public enum PlayerChanges
     ModFiles = 5,
     ModManip = 6,
     Glamourer = 7
-}
+}

MareSynchronos/PlayerData/Export/MareCharaFileData.cs

@@ -13,8 +13,8 @@ public record MareCharaFileData
     public string CustomizePlusData { get; set; } = string.Empty;
     public string PalettePlusData { get; set; } = string.Empty;
     public string ManipulationData { get; set; } = string.Empty;
-    public List<FileData> Files { get; set; } = new();
+    public List<FileData> Files { get; set; } = [];
-    public List<FileSwap> FileSwaps { get; set; } = new();
+    public List<FileSwap> FileSwaps { get; set; } = [];
 
     public MareCharaFileData() { }
     public MareCharaFileData(FileCacheManager manager, string description, CharacterData dto)

MareSynchronos/PlayerData/Export/MareCharaFileManager.cs

@@ -1,16 +1,16 @@
 using Dalamud.Game.ClientState.Objects.Types;
 using LZ4;
-using MareSynchronos.FileCache;
 using MareSynchronos.API.Data.Enum;
-using MareSynchronos.MareConfiguration;
+using MareSynchronos.FileCache;
-using CharacterData = MareSynchronos.API.Data.CharacterData;
-using Microsoft.Extensions.Logging;
-using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.Interop;
-using MareSynchronos.Services;
+using MareSynchronos.MareConfiguration;
-using MareSynchronos.Utils;
 using MareSynchronos.PlayerData.Factories;
+using MareSynchronos.PlayerData.Handlers;
+using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
+using MareSynchronos.Utils;
+using Microsoft.Extensions.Logging;
+using CharacterData = MareSynchronos.API.Data.CharacterData;
 
 namespace MareSynchronos.PlayerData.Export;
 
@@ -20,11 +20,11 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
     private readonly DalamudUtilService _dalamudUtil;
     private readonly MareCharaFileDataFactory _factory;
     private readonly GameObjectHandlerFactory _gameObjectHandlerFactory;
+    private readonly Dictionary<string, GameObjectHandler> _gposeGameObjects;
     private readonly IpcManager _ipcManager;
     private readonly ILogger<MareCharaFileManager> _logger;
     private readonly FileCacheManager _manager;
     private int _globalFileCounter = 0;
-    private readonly Dictionary<string, GameObjectHandler> _gposeGameObjects;
     private bool _isInGpose = false;
 
     public MareCharaFileManager(ILogger<MareCharaFileManager> logger, GameObjectHandlerFactory gameObjectHandlerFactory,
@@ -38,7 +38,7 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
         _ipcManager = ipcManager;
         _configService = configService;
         _dalamudUtil = dalamudUtil;
-        _gposeGameObjects = new();
+        _gposeGameObjects = [];
         Mediator.Subscribe<GposeStartMessage>(this, _ => _isInGpose = true);
         Mediator.Subscribe<GposeEndMessage>(this, async _ =>
         {
@@ -46,9 +46,9 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
             CancellationTokenSource cts = new();
             foreach (var item in _gposeGameObjects)
             {
-                if ((await dalamudUtil.RunOnFrameworkThread(() => item.Value.CurrentAddress())) != nint.Zero)
+                if ((await dalamudUtil.RunOnFrameworkThread(() => item.Value.CurrentAddress()).ConfigureAwait(false)) != nint.Zero)
                 {
-                    await _ipcManager.GlamourerRevert(logger, item.Value, Guid.NewGuid(), cts.Token);
+                    await _ipcManager.GlamourerRevert(logger, item.Value, Guid.NewGuid(), cts.Token).ConfigureAwait(false);
                 }
                 else
                 {
@@ -97,9 +97,8 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
                 await _ipcManager.PenumbraSetTemporaryModsAsync(_logger, applicationId, coll, extractedFiles.Union(fileSwaps).ToDictionary(d => d.Key, d => d.Value, StringComparer.Ordinal)).ConfigureAwait(false);
                 await _ipcManager.PenumbraSetManipulationDataAsync(_logger, applicationId, coll, LoadedCharaFile.CharaFileData.ManipulationData).ConfigureAwait(false);
 
-
                 GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.Player,
-                    () => _dalamudUtil.GetGposeCharacterFromObjectTableByName(charaTarget.Name.ToString(), _isInGpose)?.Address ?? IntPtr.Zero, false).ConfigureAwait(false);
+                    () => _dalamudUtil.GetGposeCharacterFromObjectTableByName(charaTarget.Name.ToString(), _isInGpose)?.Address ?? IntPtr.Zero, isWatched: false).ConfigureAwait(false);
 
                 if (!_gposeGameObjects.ContainsKey(charaTarget.Name.ToString()))
                     _gposeGameObjects[charaTarget.Name.ToString()] = tempHandler;
@@ -152,21 +151,7 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
             using var lz4Stream = new LZ4Stream(unwrapped, LZ4StreamMode.Decompress, LZ4StreamFlags.HighCompression);
             using var reader = new BinaryReader(lz4Stream);
             LoadedCharaFile = MareCharaFileHeader.FromBinaryReader(filePath, reader);
-            /*using var unwrapped2 = File.OpenRead(filePath);
+
-            using var lz4Stream2 = new LZ4Stream(unwrapped2, LZ4StreamMode.Decompress, LZ4StreamFlags.HighCompression);
-            using var reader2 = new BinaryReader(lz4Stream2);
-            using var writer = File.OpenWrite(filePath + ".raw");
-            using var wr = new BinaryWriter(writer);
-            var bufferSize = 4 * 1024 * 1024;
-            var buffer = new byte[bufferSize];
-            int chunk = 0;
-            int length = 0;
-            while ((length = reader2.Read(buffer)) > 0)
-            {
-                if (length < bufferSize) bufferSize = (int)length;
-                _logger.LogTrace($"Reading chunk {chunk++} {bufferSize}/{length} of {filePath}");
-                wr.Write(length > bufferSize ? buffer : buffer.Take((int)length).ToArray());
-            }*/
             _logger.LogInformation("Read Mare Chara File");
             _logger.LogInformation("Version: {ver}", (LoadedCharaFile?.Version ?? -1));
             long expectedLength = 0;

MareSynchronos/PlayerData/Factories/FileDownloadManagerFactory.cs

@@ -27,4 +27,4 @@ public class FileDownloadManagerFactory
     {
         return new FileDownloadManager(_loggerFactory.CreateLogger<FileDownloadManager>(), _mareMediator, _fileTransferOrchestrator, _fileCacheManager, _fileCompactor);
     }
-}
+}

MareSynchronos/PlayerData/Factories/PairFactory.cs

@@ -1,4 +1,5 @@
-using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.API.Dto.User;
+using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using Microsoft.Extensions.Logging;
@@ -21,8 +22,14 @@ public class PairFactory
         _serverConfigurationManager = serverConfigurationManager;
     }
 
-    public Pair Create()
+    public Pair Create(UserFullPairDto userPairDto)
     {
-        return new Pair(_loggerFactory.CreateLogger<Pair>(), _cachedPlayerFactory, _mareMediator, _serverConfigurationManager);
+        return new Pair(_loggerFactory.CreateLogger<Pair>(), userPairDto, _cachedPlayerFactory, _mareMediator, _serverConfigurationManager);
+    }
+
+    public Pair Create(UserPairDto userPairDto)
+    {
+        return new Pair(_loggerFactory.CreateLogger<Pair>(), new(userPairDto.User, userPairDto.IndividualPairStatus, [], userPairDto.OwnPermissions, userPairDto.OtherPermissions),
+            _cachedPlayerFactory, _mareMediator, _serverConfigurationManager);
     }
 }

MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs

@@ -1,24 +1,25 @@
-using System.Diagnostics;
+using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using FFXIVClientStructs.FFXIV.Client.Game.Character;
+using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using FFXIVClientStructs.FFXIV.Client.System.Resource;
 using MareSynchronos.API.Data.Enum;
-using MareSynchronos.Interop;
-using Object = FFXIVClientStructs.FFXIV.Client.Graphics.Scene.Object;
 using MareSynchronos.FileCache;
-using Microsoft.Extensions.Logging;
+using MareSynchronos.Interop;
-using System.Globalization;
 using MareSynchronos.PlayerData.Data;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.Services;
-using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
+using Microsoft.Extensions.Logging;
+using System.Diagnostics;
+using System.Globalization;
 using CharacterData = MareSynchronos.PlayerData.Data.CharacterData;
+using Object = FFXIVClientStructs.FFXIV.Client.Graphics.Scene.Object;
 using Weapon = MareSynchronos.Interop.Weapon;
 
 namespace MareSynchronos.PlayerData.Factories;
 
 public class PlayerDataFactory
 {
+    private static readonly string[] _allowedExtensionsForGamePaths = [".mdl", ".tex", ".mtrl", ".tmb", ".pap", ".avfx", ".atex", ".sklb", ".eid", ".phyb", ".scd", ".skp", ".shpk"];
     private readonly DalamudUtilService _dalamudUtil;
     private readonly FileCacheManager _fileCacheManager;
     private readonly IpcManager _ipcManager;
@@ -26,8 +27,6 @@ public class PlayerDataFactory
     private readonly PerformanceCollectorService _performanceCollector;
     private readonly TransientResourceManager _transientResourceManager;
 
-    private static readonly string[] AllowedExtensionsForGamePaths = { ".mdl", ".tex", ".mtrl", ".tmb", ".pap", ".avfx", ".atex", ".sklb", ".eid", ".phyb", ".scd", ".skp", ".shpk" };
-
     public PlayerDataFactory(ILogger<PlayerDataFactory> logger, DalamudUtilService dalamudUtil, IpcManager ipcManager,
         TransientResourceManager transientResourceManager, FileCacheManager fileReplacementFactory,
         PerformanceCollectorService performanceCollector)
@@ -307,19 +306,16 @@ public class PlayerDataFactory
 
         _logger.LogDebug("Building character data for {obj}", playerRelatedObject);
 
-        if (!previousData.FileReplacements.ContainsKey(objectKind))
+        if (!previousData.FileReplacements.TryGetValue(objectKind, out HashSet<FileReplacement>? value))
         {
             previousData.FileReplacements[objectKind] = new(FileReplacementComparer.Instance);
         }
         else
         {
-            previousData.FileReplacements[objectKind].Clear();
+            value.Clear();
         }
 
-        if (previousData.CustomizePlusScale.ContainsKey(objectKind))
+        previousData.CustomizePlusScale.Remove(objectKind);
-        {
-            previousData.CustomizePlusScale.Remove(objectKind);
-        }
 
         // wait until chara is not drawing and present so nothing spontaneously explodes
         await _dalamudUtil.WaitWhileCharacterIsDrawing(_logger, playerRelatedObject, Guid.NewGuid(), 30000, ct: token).ConfigureAwait(false);
@@ -341,9 +337,9 @@ public class PlayerDataFactory
         var (forwardResolve, reverseResolve) = await _dalamudUtil.RunOnFrameworkThread(() => BuildDataFromModel(objectKind, charaPointer, token)).ConfigureAwait(false);
         Dictionary<string, List<string>> resolvedPaths = await GetFileReplacementsFromPaths(forwardResolve, reverseResolve).ConfigureAwait(false);
         previousData.FileReplacements[objectKind] =
-                new HashSet<FileReplacement>(resolvedPaths.Select(c => new FileReplacement(c.Value.ToArray(), c.Key)), FileReplacementComparer.Instance)
+                new HashSet<FileReplacement>(resolvedPaths.Select(c => new FileReplacement([.. c.Value], c.Key)), FileReplacementComparer.Instance)
                 .Where(p => p.HasFileReplacement).ToHashSet();
-        previousData.FileReplacements[objectKind].RemoveWhere(c => c.GamePaths.Any(g => !AllowedExtensionsForGamePaths.Any(e => g.EndsWith(e, StringComparison.OrdinalIgnoreCase))));
+        previousData.FileReplacements[objectKind].RemoveWhere(c => c.GamePaths.Any(g => !_allowedExtensionsForGamePaths.Any(e => g.EndsWith(e, StringComparison.OrdinalIgnoreCase))));
 
         _logger.LogDebug("== Static Replacements ==");
         foreach (var replacement in previousData.FileReplacements[objectKind].Where(i => i.HasFileReplacement).OrderBy(i => i.GamePaths.First(), StringComparer.OrdinalIgnoreCase))
@@ -371,14 +367,14 @@ public class PlayerDataFactory
         var resolvedTransientPaths = await GetFileReplacementsFromPaths(transientPaths, new HashSet<string>(StringComparer.Ordinal)).ConfigureAwait(false);
 
         _logger.LogDebug("== Transient Replacements ==");
-        foreach (var replacement in resolvedTransientPaths.Select(c => new FileReplacement(c.Value.ToArray(), c.Key)).OrderBy(f => f.ResolvedPath, StringComparer.Ordinal))
+        foreach (var replacement in resolvedTransientPaths.Select(c => new FileReplacement([.. c.Value], c.Key)).OrderBy(f => f.ResolvedPath, StringComparer.Ordinal))
         {
             _logger.LogDebug("=> {repl}", replacement);
             previousData.FileReplacements[objectKind].Add(replacement);
         }
 
         // clean up all semi transient resources that don't have any file replacement (aka null resolve)
-        _transientResourceManager.CleanUpSemiTransientResources(objectKind, previousData.FileReplacements[objectKind].ToList());
+        _transientResourceManager.CleanUpSemiTransientResources(objectKind, [.. previousData.FileReplacements[objectKind]]);
 
         // make sure we only return data that actually has file replacements
         foreach (var item in previousData.FileReplacements)
@@ -407,16 +403,16 @@ public class PlayerDataFactory
         previousData.HeelsData = await getHeelsOffset.ConfigureAwait(false);
         _logger.LogDebug("Heels is now: {heels}", previousData.HeelsData);
 
-        if (previousData.FileReplacements.ContainsKey(objectKind))
+        if (previousData.FileReplacements.TryGetValue(objectKind, out HashSet<FileReplacement>? fileReplacements))
         {
-            var toCompute = previousData.FileReplacements[objectKind].Where(f => !f.IsFileSwap).ToArray();
+            var toCompute = fileReplacements.Where(f => !f.IsFileSwap).ToArray();
             _logger.LogDebug("Getting Hashes for {amount} Files", toCompute.Length);
             var computedPaths = _fileCacheManager.GetFileCachesByPaths(toCompute.Select(c => c.ResolvedPath).ToArray());
             foreach (var file in toCompute)
             {
                 file.Hash = computedPaths[file.ResolvedPath]?.Hash ?? string.Empty;
             }
-            var removed = previousData.FileReplacements[objectKind].RemoveWhere(f => !f.IsFileSwap && string.IsNullOrEmpty(f.Hash));
+            var removed = fileReplacements.RemoveWhere(f => !f.IsFileSwap && string.IsNullOrEmpty(f.Hash));
             if (removed > 0)
             {
                 _logger.LogDebug("Removed {amount} of invalid files", removed);
@@ -444,7 +440,7 @@ public class PlayerDataFactory
             }
             else
             {
-                resolvedPaths[filePath] = new List<string> { forwardPaths[i].ToLowerInvariant() };
+                resolvedPaths[filePath] = [forwardPaths[i].ToLowerInvariant()];
             }
         }
 

MareSynchronos/PlayerData/Handlers/GameObjectHandler.cs

@@ -200,7 +200,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase
             if (_clearCts != null)
             {
                 Logger.LogDebug("[{this}] Cancelling Clear Task", this);
-                _clearCts?.CancelDispose();
+                _clearCts.CancelDispose();
                 _clearCts = null;
             }
             var chara = (Character*)Address;
@@ -274,32 +274,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase
         }
     }
 
-    private unsafe bool CompareAndUpdateMainHand(Weapon* weapon)
-    {
-        if ((nint)weapon == nint.Zero) return false;
-        bool hasChanges = false;
-        hasChanges |= weapon->ModelSetId != MainHandData[0];
-        MainHandData[0] = weapon->ModelSetId;
-        hasChanges |= weapon->Variant != MainHandData[1];
-        MainHandData[1] = weapon->Variant;
-        hasChanges |= weapon->SecondaryId != MainHandData[2];
-        MainHandData[2] = weapon->SecondaryId;
-        return hasChanges;
-    }
-
-    private unsafe bool CompareAndUpdateOffHand(Weapon* weapon)
-    {
-        if ((nint)weapon == nint.Zero) return false;
-        bool hasChanges = false;
-        hasChanges |= weapon->ModelSetId != OffHandData[0];
-        OffHandData[0] = weapon->ModelSetId;
-        hasChanges |= weapon->Variant != OffHandData[1];
-        OffHandData[1] = weapon->Variant;
-        hasChanges |= weapon->SecondaryId != OffHandData[2];
-        OffHandData[2] = weapon->SecondaryId;
-        return hasChanges;
-    }
-
     private async Task ClearAsync(CancellationToken token)
     {
         Logger.LogDebug("[{this}] Running Clear Task", this);
@@ -342,6 +316,32 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase
         return hasChanges;
     }
 
+    private unsafe bool CompareAndUpdateMainHand(Weapon* weapon)
+    {
+        if ((nint)weapon == nint.Zero) return false;
+        bool hasChanges = false;
+        hasChanges |= weapon->ModelSetId != MainHandData[0];
+        MainHandData[0] = weapon->ModelSetId;
+        hasChanges |= weapon->Variant != MainHandData[1];
+        MainHandData[1] = weapon->Variant;
+        hasChanges |= weapon->SecondaryId != MainHandData[2];
+        MainHandData[2] = weapon->SecondaryId;
+        return hasChanges;
+    }
+
+    private unsafe bool CompareAndUpdateOffHand(Weapon* weapon)
+    {
+        if ((nint)weapon == nint.Zero) return false;
+        bool hasChanges = false;
+        hasChanges |= weapon->ModelSetId != OffHandData[0];
+        OffHandData[0] = weapon->ModelSetId;
+        hasChanges |= weapon->Variant != OffHandData[1];
+        OffHandData[1] = weapon->Variant;
+        hasChanges |= weapon->SecondaryId != OffHandData[2];
+        OffHandData[2] = weapon->SecondaryId;
+        return hasChanges;
+    }
+
     private void FrameworkUpdate()
     {
         if (!_delayedZoningTask?.IsCompleted ?? false) return;

MareSynchronos/PlayerData/Handlers/PairHandler.cs

@@ -32,6 +32,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     private GameObjectHandler? _charaHandler;
     private CancellationTokenSource? _downloadCancellationTokenSource = new();
     private bool _forceApplyMods = false;
+    private bool _isVisible;
     private string _penumbraCollection;
 
     public PairHandler(ILogger<PairHandler> logger, OnlineUserIdentDto onlineUser,
@@ -71,7 +72,18 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         });
     }
 
-    public bool IsVisible { get; private set; }
+    public bool IsVisible
+    {
+        get => _isVisible;
+        private set
+        {
+            if (_isVisible != value)
+            {
+                _isVisible = value;
+                Mediator.Publish(new RefreshUiMessage());
+            }
+        }
+    }
     public OnlineUserIdentDto OnlineUser { get; private set; }
     public nint PlayerCharacter => _charaHandler?.Address ?? nint.Zero;
     public unsafe uint PlayerCharacterId => (_charaHandler?.Address ?? nint.Zero) == nint.Zero
@@ -87,14 +99,14 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
             Logger.LogDebug("[BASE-{appBase}] Received data but player was in invalid state, charaHandlerIsNull: {charaIsNull}, playerPointerIsNull: {ptrIsNull}",
                 applicationBase, _charaHandler == null, PlayerCharacter == IntPtr.Zero);
             var hasDiffMods = characterData.CheckUpdatedData(applicationBase, _cachedData, Logger,
-                this, forceApplyCustomization, false).Any(p => p.Value.Contains(PlayerChanges.ModManip) || p.Value.Contains(PlayerChanges.ModFiles));
+                this, forceApplyCustomization, forceApplyMods: false).Any(p => p.Value.Contains(PlayerChanges.ModManip) || p.Value.Contains(PlayerChanges.ModFiles));
             _forceApplyMods = hasDiffMods || _forceApplyMods || (PlayerCharacter == IntPtr.Zero && _cachedData == null);
             _cachedData = characterData;
             Logger.LogDebug("[BASE-{appBase}] Setting data: {hash}, forceApplyMods: {force}", applicationBase, _cachedData.DataHash.Value, _forceApplyMods);
             return;
         }
 
-        SetUploading(false);
+        SetUploading(isUploading: false);
 
         Logger.LogDebug("[BASE-{appbase}] Applying data for {player}, forceApplyCustomization: {forced}, forceApplyMods: {forceMods}", applicationBase, this, forceApplyCustomization, _forceApplyMods);
         Logger.LogDebug("[BASE-{appbase}] Hash for data is {newHash}, current cache hash is {oldHash}", applicationBase, characterData.DataHash.Value, _cachedData?.DataHash.Value ?? "NODATA");
@@ -146,7 +158,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     {
         base.Dispose(disposing);
 
-        SetUploading(false);
+        SetUploading(isUploading: false);
         _downloadManager.Dispose();
         var name = PlayerName;
         Logger.LogDebug("Disposing {name} ({user})", name, OnlineUser);
@@ -167,7 +179,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                 Logger.LogTrace("[{applicationId}] Restoring state for {name} ({OnlineUser})", applicationId, name, OnlineUser);
                 _ipcManager.PenumbraRemoveTemporaryCollectionAsync(Logger, applicationId, _penumbraCollection).GetAwaiter().GetResult();
 
-                foreach (KeyValuePair<ObjectKind, List<FileReplacementData>> item in _cachedData?.FileReplacements ?? new())
+                foreach (KeyValuePair<ObjectKind, List<FileReplacementData>> item in _cachedData?.FileReplacements ?? [])
                 {
                     try
                     {
@@ -201,15 +213,14 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         var handler = changes.Key switch
         {
             ObjectKind.Player => _charaHandler!,
-            ObjectKind.Companion => await _gameObjectHandlerFactory.Create(changes.Key, () => _dalamudUtil.GetCompanion(ptr), false).ConfigureAwait(false),
+            ObjectKind.Companion => await _gameObjectHandlerFactory.Create(changes.Key, () => _dalamudUtil.GetCompanion(ptr), isWatched: false).ConfigureAwait(false),
-            ObjectKind.MinionOrMount => await _gameObjectHandlerFactory.Create(changes.Key, () => _dalamudUtil.GetMinionOrMount(ptr), false).ConfigureAwait(false),
+            ObjectKind.MinionOrMount => await _gameObjectHandlerFactory.Create(changes.Key, () => _dalamudUtil.GetMinionOrMount(ptr), isWatched: false).ConfigureAwait(false),
-            ObjectKind.Pet => await _gameObjectHandlerFactory.Create(changes.Key, () => _dalamudUtil.GetPet(ptr), false).ConfigureAwait(false),
+            ObjectKind.Pet => await _gameObjectHandlerFactory.Create(changes.Key, () => _dalamudUtil.GetPet(ptr), isWatched: false).ConfigureAwait(false),
             _ => throw new NotSupportedException("ObjectKind not supported: " + changes.Key)
         };
 
         try
         {
-            bool alreadyRedrawn = false;
             if (handler.Address == nint.Zero)
             {
                 return;
@@ -262,7 +273,6 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
 
             if (changes.Value.Contains(PlayerChanges.ModFiles) || changes.Value.Contains(PlayerChanges.ModManip) || changes.Value.Contains(PlayerChanges.Glamourer))
                 await _ipcManager.PenumbraRedrawAsync(Logger, handler, applicationId, token).ConfigureAwait(false);
-
         }
         finally
         {
@@ -312,7 +322,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
 
                     toDownloadReplacements = TryCalculateModdedDictionary(applicationBase, charaData, out moddedPaths, downloadToken);
 
-                    if (toDownloadReplacements.All(c => _downloadManager.ForbiddenTransfers.Any(f => string.Equals(f.Hash, c.Hash, StringComparison.Ordinal))))
+                    if (toDownloadReplacements.TrueForAll(c => _downloadManager.ForbiddenTransfers.Exists(f => string.Equals(f.Hash, c.Hash, StringComparison.Ordinal))))
                     {
                         break;
                     }
@@ -396,7 +406,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
             var pc = _dalamudUtil.FindPlayerByNameHash(OnlineUser.Ident);
             if (pc == default((string, nint))) return;
             Logger.LogDebug("One-Time Initializing {this}", this);
-            Initialize(pc.Name.ToString());
+            Initialize(pc.Name);
             Logger.LogDebug("One-Time Initialized {this}", this);
         }
 
@@ -411,7 +421,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
 
                 _ = Task.Run(() =>
                 {
-                    ApplyCharacterData(appData, _cachedData!, true);
+                    ApplyCharacterData(appData, _cachedData!, forceApplyCustomization: true);
                 });
             }
             else
@@ -432,7 +442,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     private void Initialize(string name)
     {
         PlayerName = name;
-        _charaHandler = _gameObjectHandlerFactory.Create(ObjectKind.Player, () => _dalamudUtil.GetPlayerCharacterFromCachedTableByIdent(OnlineUser.Ident), false).GetAwaiter().GetResult();
+        _charaHandler = _gameObjectHandlerFactory.Create(ObjectKind.Player, () => _dalamudUtil.GetPlayerCharacterFromCachedTableByIdent(OnlineUser.Ident), isWatched: false).GetAwaiter().GetResult();
 
         Mediator.Subscribe<HonorificReadyMessage>(this, async (_) =>
         {
@@ -456,7 +466,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
 
         if (objectKind == ObjectKind.Player)
         {
-            using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.Player, () => address, false).ConfigureAwait(false);
+            using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.Player, () => address, isWatched: false).ConfigureAwait(false);
             tempHandler.CompareNameAndThrow(name);
             Logger.LogDebug("[{applicationId}] Restoring Customization and Equipment for {alias}/{name}", applicationId, OnlineUser.User.AliasOrUID, name);
             await _ipcManager.GlamourerRevert(Logger, tempHandler, applicationId, cancelToken.Token).ConfigureAwait(false);
@@ -479,7 +489,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
             if (minionOrMount != nint.Zero)
             {
                 await _ipcManager.CustomizePlusRevertAsync(minionOrMount).ConfigureAwait(false);
-                using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.MinionOrMount, () => minionOrMount, false).ConfigureAwait(false);
+                using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.MinionOrMount, () => minionOrMount, isWatched: false).ConfigureAwait(false);
                 await _ipcManager.GlamourerRevert(Logger, tempHandler, applicationId, cancelToken.Token).ConfigureAwait(false);
                 await _ipcManager.PenumbraRedrawAsync(Logger, tempHandler, applicationId, cancelToken.Token).ConfigureAwait(false);
             }
@@ -490,7 +500,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
             if (pet != nint.Zero)
             {
                 await _ipcManager.CustomizePlusRevertAsync(pet).ConfigureAwait(false);
-                using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.Pet, () => pet, false).ConfigureAwait(false);
+                using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.Pet, () => pet, isWatched: false).ConfigureAwait(false);
                 await _ipcManager.GlamourerRevert(Logger, tempHandler, applicationId, cancelToken.Token).ConfigureAwait(false);
                 await _ipcManager.PenumbraRedrawAsync(Logger, tempHandler, applicationId, cancelToken.Token).ConfigureAwait(false);
             }
@@ -501,7 +511,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
             if (companion != nint.Zero)
             {
                 await _ipcManager.CustomizePlusRevertAsync(companion).ConfigureAwait(false);
-                using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.Pet, () => companion, false).ConfigureAwait(false);
+                using GameObjectHandler tempHandler = await _gameObjectHandlerFactory.Create(ObjectKind.Pet, () => companion, isWatched: false).ConfigureAwait(false);
                 await _ipcManager.GlamourerRevert(Logger, tempHandler, applicationId, cancelToken.Token).ConfigureAwait(false);
                 await _ipcManager.PenumbraRedrawAsync(Logger, tempHandler, applicationId, cancelToken.Token).ConfigureAwait(false);
             }
@@ -513,7 +523,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     private List<FileReplacementData> TryCalculateModdedDictionary(Guid applicationBase, CharacterData charaData, out Dictionary<string, string> moddedDictionary, CancellationToken token)
     {
         Stopwatch st = Stopwatch.StartNew();
-        ConcurrentBag<FileReplacementData> missingFiles = new();
+        ConcurrentBag<FileReplacementData> missingFiles = [];
         moddedDictionary = new Dictionary<string, string>(StringComparer.Ordinal);
         ConcurrentDictionary<string, string> outputDict = new(StringComparer.Ordinal);
         bool hasMigrationChanges = false;
@@ -535,7 +545,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                     if (string.IsNullOrEmpty(new FileInfo(fileCache.ResolvedFilepath).Extension))
                     {
                         hasMigrationChanges = true;
-                        fileCache = _fileDbManager.MigrateFileHashToExtension(fileCache, item.GamePaths[0].Split(".").Last());
+                        fileCache = _fileDbManager.MigrateFileHashToExtension(fileCache, item.GamePaths[0].Split(".")[^1]);
                     }
 
                     foreach (var gamePath in item.GamePaths)
@@ -568,6 +578,6 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         if (hasMigrationChanges) _fileDbManager.WriteOutFullCsv();
         st.Stop();
         Logger.LogDebug("[BASE-{appBase}] ModdedPaths calculated in {time}ms, missing files: {count}, total files: {total}", applicationBase, st.ElapsedMilliseconds, missingFiles.Count, moddedDictionary.Keys.Count);
-        return missingFiles.ToList();
+        return [.. missingFiles];
     }
 }

MareSynchronos/PlayerData/Pairs/OnlinePlayerManager.cs

@@ -14,7 +14,7 @@ public class OnlinePlayerManager : DisposableMediatorSubscriberBase
     private readonly ApiController _apiController;
     private readonly DalamudUtilService _dalamudUtil;
     private readonly FileUploadManager _fileTransferManager;
-    private readonly HashSet<PairHandler> _newVisiblePlayers = new();
+    private readonly HashSet<PairHandler> _newVisiblePlayers = [];
     private readonly PairManager _pairManager;
     private CharacterData? _lastSentData;
 

MareSynchronos/PlayerData/Pairs/OptionalPluginWarning.cs

@@ -6,4 +6,4 @@ public record OptionalPluginWarning
     public bool ShownCustomizePlusWarning { get; set; } = false;
     public bool ShownPalettePlusWarning { get; set; } = false;
     public bool ShownHonorificWarning { get; set; } = false;
-}
+}

MareSynchronos/PlayerData/Pairs/Pair.cs

@@ -1,8 +1,8 @@
 using Dalamud.ContextMenu;
+using Dalamud.Game.Text.SeStringHandling;
 using MareSynchronos.API.Data;
-using MareSynchronos.API.Data.Comparer;
+using MareSynchronos.API.Data.Enum;
 using MareSynchronos.API.Data.Extensions;
-using MareSynchronos.API.Dto.Group;
 using MareSynchronos.API.Dto.User;
 using MareSynchronos.PlayerData.Factories;
 using MareSynchronos.PlayerData.Handlers;
@@ -23,54 +23,55 @@ public class Pair
     private CancellationTokenSource _applicationCts = new CancellationTokenSource();
     private OnlineUserIdentDto? _onlineUserIdentDto = null;
 
-    public Pair(ILogger<Pair> logger, PairHandlerFactory cachedPlayerFactory,
+    public Pair(ILogger<Pair> logger, UserFullPairDto userPair, PairHandlerFactory cachedPlayerFactory,
         MareMediator mediator, ServerConfigurationManager serverConfigurationManager)
     {
         _logger = logger;
+        UserPair = userPair;
         _cachedPlayerFactory = cachedPlayerFactory;
         _mediator = mediator;
         _serverConfigurationManager = serverConfigurationManager;
     }
 
-    public Dictionary<GroupFullInfoDto, GroupPairFullInfoDto> GroupPair { get; set; } = new(GroupDtoComparer.Instance);
     public bool HasCachedPlayer => CachedPlayer != null && !string.IsNullOrEmpty(CachedPlayer.PlayerName) && _onlineUserIdentDto != null;
+    public IndividualPairStatus IndividualPairStatus => UserPair.IndividualPairStatus;
+    public bool IsDirectlyPaired => IndividualPairStatus != IndividualPairStatus.None;
+    public bool IsOneSidedPair => IndividualPairStatus == IndividualPairStatus.OneSided;
     public bool IsOnline => CachedPlayer != null;
 
-    public bool IsPaused => UserPair != null && UserPair.OtherPermissions.IsPaired() ? UserPair.OtherPermissions.IsPaused() || UserPair.OwnPermissions.IsPaused()
+    public bool IsPaired => IndividualPairStatus == IndividualPairStatus.Bidirectional || UserPair.Groups.Any();
-            : GroupPair.All(p => p.Key.GroupUserPermissions.IsPaused() || p.Value.GroupUserPermissions.IsPaused());
+    public bool IsPaused => UserPair.OtherPermissions.IsPaused() || UserPair.OwnPermissions.IsPaused();
-
     public bool IsVisible => CachedPlayer?.IsVisible ?? false;
     public CharacterData? LastReceivedCharacterData { get; set; }
     public string? PlayerName => CachedPlayer?.PlayerName ?? string.Empty;
 
-    public UserData UserData => UserPair?.User ?? GroupPair.First().Value.User;
+    public UserData UserData => UserPair.User;
-
-    public UserPairDto? UserPair { get; set; }
 
+    public UserFullPairDto UserPair { get; set; }
     private PairHandler? CachedPlayer { get; set; }
 
     public void AddContextMenu(GameObjectContextMenuOpenArgs args)
     {
-        if (CachedPlayer == null || args.ObjectId != CachedPlayer.PlayerCharacterId) return;
+        if (CachedPlayer == null || args.ObjectId != CachedPlayer.PlayerCharacterId || IsPaused) return;
 
-        if (!IsPaused)
+        SeStringBuilder seStringBuilder = new();
+        SeStringBuilder seStringBuilder2 = new();
+        SeStringBuilder seStringBuilder3 = new();
+        var openProfileSeString = seStringBuilder.AddUiForeground(526).AddText(" ").AddUiForegroundOff().AddText("Open Profile").Build();
+        var reapplyDataSeString = seStringBuilder2.AddUiForeground(526).AddText(" ").AddUiForegroundOff().AddText("Reapply last data").Build();
+        var cyclePauseState = seStringBuilder3.AddUiForeground(526).AddText(" ").AddUiForegroundOff().AddText("Cycle pause state").Build();
+        args.AddCustomItem(new GameObjectContextMenuItem(openProfileSeString, (a) =>
         {
-            args.AddCustomItem(new GameObjectContextMenuItem("[Mare] Open Profile", (a) =>
+            _mediator.Publish(new ProfileOpenStandaloneMessage(this));
-            {
+        }));
-                _mediator.Publish(new ProfileOpenStandaloneMessage(this));
+        args.AddCustomItem(new GameObjectContextMenuItem(reapplyDataSeString, (a) =>
-            }));
-        }
-        args.AddCustomItem(new GameObjectContextMenuItem("[Mare] Reapply last data", (a) =>
         {
-            ApplyLastReceivedData(true);
+            ApplyLastReceivedData(forced: true);
-        }, false));
+        }, useDalamudIndicator: false));
-        if (UserPair != null && UserPair.OtherPermissions.IsPaired() && UserPair.OwnPermissions.IsPaired())
+        args.AddCustomItem(new GameObjectContextMenuItem(cyclePauseState, (a) =>
         {
-            args.AddCustomItem(new GameObjectContextMenuItem("[Mare] Cycle pause state", (a) =>
+            _mediator.Publish(new CyclePauseMessage(UserData));
-            {
+        }, useDalamudIndicator: false));
-                _mediator.Publish(new CyclePauseMessage(UserData));
-            }, false));
-        }
     }
 
     public void ApplyData(OnlineUserCharaDataDto data)
@@ -152,7 +153,7 @@ public class Pair
 
     public bool HasAnyConnection()
     {
-        return UserPair != null || GroupPair.Any();
+        return UserPair.Groups.Any() || UserPair.IndividualPairStatus != IndividualPairStatus.None;
     }
 
     public void MarkOffline()
@@ -191,37 +192,29 @@ public class Pair
             return data;
         }
 
-        bool disableIndividualAnimations = UserPair != null && (UserPair.OtherPermissions.IsDisableAnimations() || UserPair.OwnPermissions.IsDisableAnimations());
+        bool disableIndividualAnimations = (UserPair.OtherPermissions.IsDisableAnimations() || UserPair.OwnPermissions.IsDisableAnimations());
-        bool disableIndividualVFX = UserPair != null && (UserPair.OtherPermissions.IsDisableVFX() || UserPair.OwnPermissions.IsDisableVFX());
+        bool disableIndividualVFX = (UserPair.OtherPermissions.IsDisableVFX() || UserPair.OwnPermissions.IsDisableVFX());
-        bool disableGroupAnimations = GroupPair.All(pair => pair.Value.GroupUserPermissions.IsDisableAnimations() || pair.Key.GroupPermissions.IsDisableAnimations() || pair.Key.GroupUserPermissions.IsDisableAnimations());
+        bool disableIndividualSounds = (UserPair.OtherPermissions.IsDisableSounds() || UserPair.OwnPermissions.IsDisableSounds());
 
-        bool disableAnimations = (UserPair != null && disableIndividualAnimations) || (UserPair == null && disableGroupAnimations);
+        _logger.LogTrace("Disable: Sounds: {disableIndividualSounds}, Anims: {disableIndividualAnims}; " +
+            "VFX: {disableGroupSounds}",
+            disableIndividualSounds, disableIndividualAnimations, disableIndividualVFX);
 
-        bool disableIndividualSounds = UserPair != null && (UserPair.OtherPermissions.IsDisableSounds() || UserPair.OwnPermissions.IsDisableSounds());
+        if (disableIndividualAnimations || disableIndividualSounds || disableIndividualVFX)
-        bool disableGroupSounds = GroupPair.All(pair => pair.Value.GroupUserPermissions.IsDisableSounds() || pair.Key.GroupPermissions.IsDisableSounds() || pair.Key.GroupUserPermissions.IsDisableSounds());
-        bool disableGroupVFX = GroupPair.All(pair => pair.Value.GroupUserPermissions.IsDisableVFX() || pair.Key.GroupPermissions.IsDisableVFX() || pair.Key.GroupUserPermissions.IsDisableVFX());
-
-        bool disableSounds = (UserPair != null && disableIndividualSounds) || (UserPair == null && disableGroupSounds);
-        bool disableVFX = (UserPair != null && disableIndividualVFX) || (UserPair == null && disableGroupVFX);
-
-        _logger.LogTrace("Individual Sounds: {disableIndividualSounds}, Individual Anims: {disableIndividualAnims}; " +
-            "Group Sounds: {disableGroupSounds}, Group Anims: {disableGroupAnims} => Disable Sounds: {disableSounds}, Disable Anims: {disableAnims}",
-            disableIndividualSounds, disableIndividualAnimations, disableGroupSounds, disableGroupAnimations, disableSounds, disableAnimations);
-
-        if (disableAnimations || disableSounds)
         {
-            _logger.LogTrace("Data cleaned up: Animations disabled: {disableAnimations}, Sounds disabled: {disableSounds}, VFX disabled: {disableVFX}", disableAnimations, disableSounds, disableVFX);
+            _logger.LogTrace("Data cleaned up: Animations disabled: {disableAnimations}, Sounds disabled: {disableSounds}, VFX disabled: {disableVFX}",
+                disableIndividualAnimations, disableIndividualSounds, disableIndividualVFX);
             foreach (var objectKind in data.FileReplacements.Select(k => k.Key))
             {
-                if (disableSounds)
+                if (disableIndividualSounds)
                     data.FileReplacements[objectKind] = data.FileReplacements[objectKind]
                         .Where(f => !f.GamePaths.Any(p => p.EndsWith("scd", StringComparison.OrdinalIgnoreCase)))
                         .ToList();
-                if (disableAnimations)
+                if (disableIndividualAnimations)
                     data.FileReplacements[objectKind] = data.FileReplacements[objectKind]
                         .Where(f => !f.GamePaths.Any(p => p.EndsWith("tmb", StringComparison.OrdinalIgnoreCase) || p.EndsWith("pap", StringComparison.OrdinalIgnoreCase)))
                         .ToList();
-                if (disableVFX)
+                if (disableIndividualVFX)
                     data.FileReplacements[objectKind] = data.FileReplacements[objectKind]
                         .Where(f => !f.GamePaths.Any(p => p.EndsWith("atex", StringComparison.OrdinalIgnoreCase) || p.EndsWith("avfx", StringComparison.OrdinalIgnoreCase)))
                         .ToList();

MareSynchronos/PlayerData/Pairs/PairManager.cs

@@ -22,6 +22,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     private readonly PairFactory _pairFactory;
     private Lazy<List<Pair>> _directPairsInternal;
     private Lazy<Dictionary<GroupFullInfoDto, List<Pair>>> _groupPairsInternal;
+    private Lazy<Dictionary<Pair, List<GroupFullInfoDto>>> _pairsWithGroupsInternal;
 
     public PairManager(ILogger<PairManager> logger, PairFactory pairFactory,
                 MareConfigService configurationService, MareMediator mediator,
@@ -34,6 +35,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         Mediator.Subscribe<CutsceneEndMessage>(this, (_) => ReapplyPairData());
         _directPairsInternal = DirectPairsLazy();
         _groupPairsInternal = GroupPairsLazy();
+        _pairsWithGroupsInternal = PairsWithGroupsLazy();
 
         _dalamudContextMenu.OnOpenGameObjectContextMenu += DalamudContextMenuOnOnOpenGameObjectContextMenu;
     }
@@ -41,8 +43,9 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     public List<Pair> DirectPairs => _directPairsInternal.Value;
 
     public Dictionary<GroupFullInfoDto, List<Pair>> GroupPairs => _groupPairsInternal.Value;
-
+    public Dictionary<GroupData, GroupFullInfoDto> Groups => _allGroups.ToDictionary(k => k.Key, k => k.Value);
     public Pair? LastAddedUser { get; internal set; }
+    public Dictionary<Pair, List<GroupFullInfoDto>> PairsWithGroups => _pairsWithGroupsInternal.Value;
 
     public void AddGroup(GroupFullInfoDto dto)
     {
@@ -52,10 +55,25 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
 
     public void AddGroupPair(GroupPairFullInfoDto dto)
     {
-        if (!_allClientPairs.ContainsKey(dto.User)) _allClientPairs[dto.User] = _pairFactory.Create();
+        if (!_allClientPairs.ContainsKey(dto.User))
+            _allClientPairs[dto.User] = _pairFactory.Create(new UserFullPairDto(dto.User, API.Data.Enum.IndividualPairStatus.None,
+                [dto.Group.GID], dto.SelfToOtherPermissions, dto.OtherToSelfPermissions));
+        else _allClientPairs[dto.User].UserPair.Groups.Add(dto.GID);
+        RecreateLazy();
+    }
+
+    public void AddUserPair(UserFullPairDto dto)
+    {
+        if (!_allClientPairs.ContainsKey(dto.User))
+        {
+            _allClientPairs[dto.User] = _pairFactory.Create(dto);
+        }
+        else
+        {
+            _allClientPairs[dto.User].UserPair.IndividualPairStatus = dto.IndividualPairStatus;
+            _allClientPairs[dto.User].ApplyLastReceivedData();
+        }
 
-        var group = _allGroups[dto.Group];
-        _allClientPairs[dto.User].GroupPair[group] = dto;
         RecreateLazy();
     }
 
@@ -63,14 +81,16 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     {
         if (!_allClientPairs.ContainsKey(dto.User))
         {
-            _allClientPairs[dto.User] = _pairFactory.Create();
+            _allClientPairs[dto.User] = _pairFactory.Create(dto);
         }
         else
         {
             addToLastAddedUser = false;
         }
 
-        _allClientPairs[dto.User].UserPair = dto;
+        _allClientPairs[dto.User].UserPair.IndividualPairStatus = dto.IndividualPairStatus;
+        _allClientPairs[dto.User].UserPair.OwnPermissions = dto.OwnPermissions;
+        _allClientPairs[dto.User].UserPair.OtherPermissions = dto.OtherPermissions;
         if (addToLastAddedUser)
             LastAddedUser = _allClientPairs[dto.User];
         _allClientPairs[dto.User].ApplyLastReceivedData();
@@ -88,18 +108,19 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
 
     public List<Pair> GetOnlineUserPairs() => _allClientPairs.Where(p => !string.IsNullOrEmpty(p.Value.GetPlayerNameHash())).Select(p => p.Value).ToList();
 
-    public List<UserData> GetVisibleUsers() => _allClientPairs.Where(p => p.Value.IsVisible).Select(p => p.Key).ToList();
-
     public int GetVisibleUserCount() => _allClientPairs.Count(p => p.Value.IsVisible);
 
+    public List<UserData> GetVisibleUsers() => _allClientPairs.Where(p => p.Value.IsVisible).Select(p => p.Key).ToList();
+
     public void MarkPairOffline(UserData user)
     {
         if (_allClientPairs.TryGetValue(user, out var pair))
         {
             Mediator.Publish(new ClearProfileDataMessage(pair.UserData));
             pair.MarkOffline();
-            RecreateLazy();
         }
+
+        RecreateLazy();
     }
 
     public void MarkPairOnline(OnlineUserIdentDto dto, bool sendNotif = true)
@@ -109,7 +130,11 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         Mediator.Publish(new ClearProfileDataMessage(dto.User));
 
         var pair = _allClientPairs[dto.User];
-        if (pair.HasCachedPlayer) return;
+        if (pair.HasCachedPlayer)
+        {
+            RecreateLazy();
+            return;
+        }
 
         if (sendNotif && _configurationService.Current.ShowOnlineNotifications
             && (_configurationService.Current.ShowOnlineNotificationsOnlyForIndividualPairs && pair.UserPair != null
@@ -125,6 +150,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         }
 
         pair.CreateCachedPlayer(dto);
+
         RecreateLazy();
     }
 
@@ -138,18 +164,18 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     public void RemoveGroup(GroupData data)
     {
         _allGroups.TryRemove(data, out _);
+
         foreach (var item in _allClientPairs.ToList())
         {
-            foreach (var grpPair in item.Value.GroupPair.Select(k => k.Key).Where(grpPair => GroupDataComparer.Instance.Equals(grpPair.Group, data)).ToList())
+            item.Value.UserPair.Groups.Remove(data.GID);
-            {
-                _allClientPairs[item.Key].GroupPair.Remove(grpPair);
-            }
 
-            if (!_allClientPairs[item.Key].HasAnyConnection() && _allClientPairs.TryRemove(item.Key, out var pair))
+            if (!item.Value.HasAnyConnection())
             {
-                pair.MarkOffline();
+                item.Value.MarkOffline();
+                _allClientPairs.TryRemove(item.Key, out _);
             }
         }
+
         RecreateLazy();
     }
 
@@ -157,36 +183,32 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     {
         if (_allClientPairs.TryGetValue(dto.User, out var pair))
         {
-            var group = _allGroups[dto.Group];
+            pair.UserPair.Groups.Remove(dto.Group.GID);
-            pair.GroupPair.Remove(group);
 
             if (!pair.HasAnyConnection())
             {
                 pair.MarkOffline();
                 _allClientPairs.TryRemove(dto.User, out _);
             }
-
-            RecreateLazy();
         }
+
+        RecreateLazy();
     }
 
     public void RemoveUserPair(UserDto dto)
     {
         if (_allClientPairs.TryGetValue(dto.User, out var pair))
         {
-            pair.UserPair = null;
+            pair.UserPair.IndividualPairStatus = API.Data.Enum.IndividualPairStatus.None;
+
             if (!pair.HasAnyConnection())
             {
                 pair.MarkOffline();
                 _allClientPairs.TryRemove(dto.User, out _);
             }
-            else
-            {
-                pair.ApplyLastReceivedData();
-            }
-
-            RecreateLazy();
         }
+
+        RecreateLazy();
     }
 
     public void SetGroupInfo(GroupInfoDto dto)
@@ -194,6 +216,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         _allGroups[dto.Group].Group = dto.Group;
         _allGroups[dto.Group].Owner = dto.Owner;
         _allGroups[dto.Group].GroupPermissions = dto.GroupPermissions;
+
         RecreateLazy();
     }
 
@@ -206,18 +229,22 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
 
         if (pair.UserPair == null) throw new InvalidOperationException("No direct pair for " + dto);
 
-        if (pair.UserPair.OtherPermissions.IsPaused() != dto.Permissions.IsPaused()
+        if (pair.UserPair.OtherPermissions.IsPaused() != dto.Permissions.IsPaused())
-            || pair.UserPair.OtherPermissions.IsPaired() != dto.Permissions.IsPaired())
         {
             Mediator.Publish(new ClearProfileDataMessage(dto.User));
         }
 
         pair.UserPair.OtherPermissions = dto.Permissions;
 
-        Logger.LogTrace("Paired: {synced}, Paused: {paused}, Anims: {anims}, Sounds: {sounds}, VFX: {vfx}",
+        Logger.LogTrace("Paused: {paused}, Anims: {anims}, Sounds: {sounds}, VFX: {vfx}",
-            pair.UserPair.OwnPermissions.IsPaired(), pair.UserPair.OwnPermissions.IsPaused(), pair.UserPair.OwnPermissions.IsDisableAnimations(), pair.UserPair.OwnPermissions.IsDisableSounds(),
+            pair.UserPair.OtherPermissions.IsPaused(),
-            pair.UserPair.OwnPermissions.IsDisableVFX());
+            pair.UserPair.OtherPermissions.IsDisableAnimations(),
+            pair.UserPair.OtherPermissions.IsDisableSounds(),
+            pair.UserPair.OtherPermissions.IsDisableVFX());
+
         pair.ApplyLastReceivedData();
+
+        RecreateLazy();
     }
 
     public void UpdateSelfPairPermissions(UserPermissionsDto dto)
@@ -227,21 +254,22 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
             throw new InvalidOperationException("No such pair for " + dto);
         }
 
-        if (pair.UserPair == null) throw new InvalidOperationException("No direct pair for " + dto);
+        if (pair.UserPair.OwnPermissions.IsPaused() != dto.Permissions.IsPaused())
-
-        if (pair.UserPair.OwnPermissions.IsPaused() != dto.Permissions.IsPaused()
-            || pair.UserPair.OwnPermissions.IsPaired() != dto.Permissions.IsPaired())
         {
             Mediator.Publish(new ClearProfileDataMessage(dto.User));
         }
 
         pair.UserPair.OwnPermissions = dto.Permissions;
 
-        Logger.LogTrace("Paired: {synced}, Paused: {paused}, Anims: {anims}, Sounds: {sounds}, VFX: {vfx}",
+        Logger.LogTrace("Paused: {paused}, Anims: {anims}, Sounds: {sounds}, VFX: {vfx}",
-            pair.UserPair.OwnPermissions.IsPaired(), pair.UserPair.OwnPermissions.IsPaused(), pair.UserPair.OwnPermissions.IsDisableAnimations(), pair.UserPair.OwnPermissions.IsDisableSounds(),
+            pair.UserPair.OwnPermissions.IsPaused(),
+            pair.UserPair.OwnPermissions.IsDisableAnimations(),
+            pair.UserPair.OwnPermissions.IsDisableSounds(),
             pair.UserPair.OwnPermissions.IsDisableVFX());
 
         pair.ApplyLastReceivedData();
+
+        RecreateLazy();
     }
 
     internal void ReceiveUploadStatus(UserDto dto)
@@ -254,60 +282,37 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
 
     internal void SetGroupPairStatusInfo(GroupPairUserInfoDto dto)
     {
-        var group = _allGroups[dto.Group];
+        _allGroups[dto.Group].GroupPairUserInfos[dto.UID] = dto.GroupUserInfo;
-        _allClientPairs[dto.User].GroupPair[group].GroupPairStatusInfo = dto.GroupUserInfo;
-        RecreateLazy();
-    }
-
-    internal void SetGroupPairUserPermissions(GroupPairUserPermissionDto dto)
-    {
-        var group = _allGroups[dto.Group];
-        var prevPermissions = _allClientPairs[dto.User].GroupPair[group].GroupUserPermissions;
-        _allClientPairs[dto.User].GroupPair[group].GroupUserPermissions = dto.GroupPairPermissions;
-        if (prevPermissions.IsDisableAnimations() != dto.GroupPairPermissions.IsDisableAnimations()
-            || prevPermissions.IsDisableSounds() != dto.GroupPairPermissions.IsDisableSounds()
-            || prevPermissions.IsDisableVFX() != dto.GroupPairPermissions.IsDisableVFX())
-        {
-            _allClientPairs[dto.User].ApplyLastReceivedData();
-        }
         RecreateLazy();
     }
 
     internal void SetGroupPermissions(GroupPermissionDto dto)
     {
-        var prevPermissions = _allGroups[dto.Group].GroupPermissions;
         _allGroups[dto.Group].GroupPermissions = dto.Permissions;
-        if (prevPermissions.IsDisableAnimations() != dto.Permissions.IsDisableAnimations()
-            || prevPermissions.IsDisableSounds() != dto.Permissions.IsDisableSounds()
-            || prevPermissions.IsDisableVFX() != dto.Permissions.IsDisableVFX())
-        {
-            RecreateLazy();
-            var group = _allGroups[dto.Group];
-            GroupPairs[group].ForEach(p => p.ApplyLastReceivedData());
-        }
         RecreateLazy();
     }
 
     internal void SetGroupStatusInfo(GroupPairUserInfoDto dto)
     {
         _allGroups[dto.Group].GroupUserInfo = dto.GroupUserInfo;
+        RecreateLazy();
     }
 
-    internal void SetGroupUserPermissions(GroupPairUserPermissionDto dto)
+    internal void UpdateGroupPairPermissions(GroupPairUserPermissionDto dto)
     {
-        var prevPermissions = _allGroups[dto.Group].GroupUserPermissions;
         _allGroups[dto.Group].GroupUserPermissions = dto.GroupPairPermissions;
-        if (prevPermissions.IsDisableAnimations() != dto.GroupPairPermissions.IsDisableAnimations()
-            || prevPermissions.IsDisableSounds() != dto.GroupPairPermissions.IsDisableSounds()
-            || prevPermissions.IsDisableVFX() != dto.GroupPairPermissions.IsDisableVFX())
-        {
-            RecreateLazy();
-            var group = _allGroups[dto.Group];
-            GroupPairs[group].ForEach(p => p.ApplyLastReceivedData());
-        }
         RecreateLazy();
     }
 
+    internal void UpdateIndividualPairStatus(UserIndividualPairStatusDto dto)
+    {
+        if (_allClientPairs.TryGetValue(dto.User, out var pair))
+        {
+            pair.UserPair.IndividualPairStatus = dto.IndividualPairStatus;
+            RecreateLazy();
+        }
+    }
+
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
@@ -328,7 +333,8 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         }
     }
 
-    private Lazy<List<Pair>> DirectPairsLazy() => new(() => _allClientPairs.Select(k => k.Value).Where(k => k.UserPair != null).ToList());
+    private Lazy<List<Pair>> DirectPairsLazy() => new(() => _allClientPairs.Select(k => k.Value)
+        .Where(k => k.IndividualPairStatus != API.Data.Enum.IndividualPairStatus.None).ToList());
 
     private void DisposePairs()
     {
@@ -345,20 +351,35 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     {
         return new Lazy<Dictionary<GroupFullInfoDto, List<Pair>>>(() =>
         {
-            Dictionary<GroupFullInfoDto, List<Pair>> outDict = new();
+            Dictionary<GroupFullInfoDto, List<Pair>> outDict = [];
             foreach (var group in _allGroups)
             {
-                outDict[group.Value] = _allClientPairs.Select(p => p.Value).Where(p => p.GroupPair.Any(g => GroupDataComparer.Instance.Equals(group.Key, g.Key.Group))).ToList();
+                outDict[group.Value] = _allClientPairs.Select(p => p.Value).Where(p => p.UserPair.Groups.Exists(g => GroupDataComparer.Instance.Equals(group.Key, new(g)))).ToList();
             }
             return outDict;
         });
     }
 
+    private Lazy<Dictionary<Pair, List<GroupFullInfoDto>>> PairsWithGroupsLazy()
+    {
+        return new Lazy<Dictionary<Pair, List<GroupFullInfoDto>>>(() =>
+        {
+            Dictionary<Pair, List<GroupFullInfoDto>> outDict = [];
+
+            foreach (var pair in _allClientPairs.Select(k => k.Value))
+            {
+                outDict[pair] = _allGroups.Where(k => pair.UserPair.Groups.Contains(k.Key.GID, StringComparer.Ordinal)).Select(k => k.Value).ToList();
+            }
+
+            return outDict;
+        });
+    }
+
     private void ReapplyPairData()
     {
         foreach (var pair in _allClientPairs.Select(k => k.Value))
         {
-            pair.ApplyLastReceivedData(true);
+            pair.ApplyLastReceivedData(forced: true);
         }
     }
 
@@ -366,5 +387,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
     {
         _directPairsInternal = DirectPairsLazy();
         _groupPairsInternal = GroupPairsLazy();
+        _pairsWithGroupsInternal = PairsWithGroupsLazy();
+        Mediator.Publish(new RefreshUiMessage());
     }
 }

MareSynchronos/PlayerData/Services/CacheCreationService.cs

@@ -8,14 +8,16 @@ using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.PlayerData.Services;
 
+#pragma warning disable MA0040
+
 public sealed class CacheCreationService : DisposableMediatorSubscriberBase
 {
     private readonly SemaphoreSlim _cacheCreateLock = new(1);
-    private readonly Dictionary<ObjectKind, GameObjectHandler> _cachesToCreate = new();
+    private readonly Dictionary<ObjectKind, GameObjectHandler> _cachesToCreate = [];
     private readonly PlayerDataFactory _characterDataFactory;
     private readonly CancellationTokenSource _cts = new();
     private readonly CharacterData _playerData = new();
-    private readonly Dictionary<ObjectKind, GameObjectHandler> _playerRelatedObjects = new();
+    private readonly Dictionary<ObjectKind, GameObjectHandler> _playerRelatedObjects = [];
     private Task? _cacheCreationTask;
     private CancellationTokenSource _honorificCts = new();
     private bool _isZoning = false;
@@ -37,13 +39,13 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
         Mediator.Subscribe<ZoneSwitchStartMessage>(this, (msg) => _isZoning = true);
         Mediator.Subscribe<ZoneSwitchEndMessage>(this, (msg) => _isZoning = false);
 
-        _playerRelatedObjects[ObjectKind.Player] = gameObjectHandlerFactory.Create(ObjectKind.Player, dalamudUtil.GetPlayerPointer, true)
+        _playerRelatedObjects[ObjectKind.Player] = gameObjectHandlerFactory.Create(ObjectKind.Player, dalamudUtil.GetPlayerPointer, isWatched: true)
             .GetAwaiter().GetResult();
-        _playerRelatedObjects[ObjectKind.MinionOrMount] = gameObjectHandlerFactory.Create(ObjectKind.MinionOrMount, () => dalamudUtil.GetMinionOrMount(), true)
+        _playerRelatedObjects[ObjectKind.MinionOrMount] = gameObjectHandlerFactory.Create(ObjectKind.MinionOrMount, () => dalamudUtil.GetMinionOrMount(), isWatched: true)
             .GetAwaiter().GetResult();
-        _playerRelatedObjects[ObjectKind.Pet] = gameObjectHandlerFactory.Create(ObjectKind.Pet, () => dalamudUtil.GetPet(), true)
+        _playerRelatedObjects[ObjectKind.Pet] = gameObjectHandlerFactory.Create(ObjectKind.Pet, () => dalamudUtil.GetPet(), isWatched: true)
             .GetAwaiter().GetResult();
-        _playerRelatedObjects[ObjectKind.Companion] = gameObjectHandlerFactory.Create(ObjectKind.Companion, () => dalamudUtil.GetCompanion(), true)
+        _playerRelatedObjects[ObjectKind.Companion] = gameObjectHandlerFactory.Create(ObjectKind.Companion, () => dalamudUtil.GetCompanion(), isWatched: true)
             .GetAwaiter().GetResult();
 
         Mediator.Subscribe<ClearCacheForObjectMessage>(this, (msg) =>
@@ -62,7 +64,7 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
         {
             if (_isZoning) return;
             foreach (var item in _playerRelatedObjects
-                .Where(item => string.IsNullOrEmpty(msg.ProfileName) 
+                .Where(item => string.IsNullOrEmpty(msg.ProfileName)
                 || string.Equals(item.Value.Name, msg.ProfileName, StringComparison.Ordinal)).Select(k => k.Key))
             {
                 Logger.LogDebug("Received CustomizePlus change, updating {obj}", item);
@@ -182,4 +184,5 @@ public sealed class CacheCreationService : DisposableMediatorSubscriberBase
             Logger.LogDebug("Cache Creation stored until previous creation finished");
         }
     }
-}
+}
+#pragma warning restore MA0040

MareSynchronos/Plugin.cs

@@ -14,6 +14,8 @@ using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.UI;
+using MareSynchronos.UI.Components;
+using MareSynchronos.UI.Components.Popup;
 using MareSynchronos.UI.Handlers;
 using MareSynchronos.WebAPI;
 using MareSynchronos.WebAPI.Files;
@@ -59,14 +61,19 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<FileTransferOrchestrator>();
             collection.AddSingleton<MarePlugin>();
             collection.AddSingleton<MareProfileManager>();
-            collection.AddSingleton<UidDisplayHandler>();
             collection.AddSingleton<GameObjectHandlerFactory>();
             collection.AddSingleton<FileDownloadManagerFactory>();
             collection.AddSingleton<PairHandlerFactory>();
             collection.AddSingleton<PairFactory>();
             collection.AddSingleton<CharacterAnalyzer>();
+            collection.AddSingleton<TokenProvider>();
             collection.AddSingleton<PluginWarningNotificationService>();
             collection.AddSingleton<FileCompactor>();
+            collection.AddSingleton<TagHandler>();
+            collection.AddSingleton<IdDisplayHandler>();
+            collection.AddSingleton<DrawEntityFactory>();
+            collection.AddSingleton<SelectPairForTagUi>();
+            collection.AddSingleton<SelectTagForPairUi>();
             collection.AddSingleton((s) => new DalamudContextMenu(pluginInterface));
             collection.AddSingleton((s) => new DalamudUtilService(s.GetRequiredService<ILogger<DalamudUtilService>>(),
                 clientState, objectTable, framework, gameGui, condition, gameData,
@@ -83,7 +90,8 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton((s) => new TransientConfigService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new ConfigurationMigrator(s.GetRequiredService<ILogger<ConfigurationMigrator>>(), pluginInterface));
             collection.AddSingleton((s) => new HubFactory(s.GetRequiredService<ILogger<HubFactory>>(), s.GetRequiredService<MareMediator>(),
-                s.GetRequiredService<ServerConfigurationManager>(), s.GetRequiredService<MareConfigService>(), pluginLog));
+                s.GetRequiredService<ServerConfigurationManager>(), s.GetRequiredService<MareConfigService>(),
+                s.GetRequiredService<TokenProvider>(), pluginLog));
 
             // func factory method singletons
             collection.AddSingleton(s =>
@@ -92,7 +100,8 @@ public sealed class Plugin : IDalamudPlugin
                     s.GetRequiredService<MareMediator>(),
                     s.GetRequiredService<UiSharedService>(),
                     s.GetRequiredService<ServerConfigurationManager>(),
-                    s.GetRequiredService<MareProfileManager>(), pair)));
+                    s.GetRequiredService<MareProfileManager>(),
+                    s.GetRequiredService<PairManager>(), pair)));
 
             // add scoped services
             collection.AddScoped<PeriodicFileScanner>();
@@ -106,6 +115,12 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddScoped<WindowMediatorSubscriberBase, EditProfileUi>((s) => new EditProfileUi(s.GetRequiredService<ILogger<EditProfileUi>>(),
                 s.GetRequiredService<MareMediator>(), s.GetRequiredService<ApiController>(), pluginInterface.UiBuilder, s.GetRequiredService<UiSharedService>(),
                 s.GetRequiredService<FileDialogManager>(), s.GetRequiredService<MareProfileManager>()));
+            collection.AddScoped<WindowMediatorSubscriberBase, PopupHandler>();
+            collection.AddScoped<IPopupHandler, ReportPopupHandler>();
+            collection.AddScoped<IPopupHandler, BanUserPopupHandler>();
+            collection.AddScoped<IPopupHandler, CreateSyncshellPopupHandler>();
+            collection.AddScoped<IPopupHandler, JoinSyncshellPopupHandler>();
+            collection.AddScoped<IPopupHandler, SyncshellAdminPopupHandler>();
             collection.AddScoped<CacheCreationService>();
             collection.AddScoped<TransientResourceManager>();
             collection.AddScoped<PlayerDataFactory>();
@@ -113,7 +128,7 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddScoped((s) => new UiService(s.GetRequiredService<ILogger<UiService>>(), pluginInterface, s.GetRequiredService<MareConfigService>(),
                 s.GetRequiredService<WindowSystem>(), s.GetServices<WindowMediatorSubscriberBase>(), s.GetRequiredService<Func<Pair, StandaloneProfileUi>>(),
                 s.GetRequiredService<FileDialogManager>(), s.GetRequiredService<MareMediator>()));
-            collection.AddScoped((s) => new CommandManagerService(commandManager, s.GetRequiredService<PerformanceCollectorService>(), s.GetRequiredService<UiService>(),
+            collection.AddScoped((s) => new CommandManagerService(commandManager, s.GetRequiredService<PerformanceCollectorService>(),
                 s.GetRequiredService<ServerConfigurationManager>(), s.GetRequiredService<PeriodicFileScanner>(), s.GetRequiredService<ApiController>(),
                 s.GetRequiredService<MareMediator>()));
             collection.AddScoped((s) => new NotificationService(s.GetRequiredService<ILogger<NotificationService>>(),
@@ -133,8 +148,6 @@ public sealed class Plugin : IDalamudPlugin
         .RunAsync(_pluginCts.Token);
     }
 
-    public string Name => "Mare Synchronos";
-
     public void Dispose()
     {
         _pluginCts.Cancel();

MareSynchronos/Services/CharacterAnalyzer.cs

@@ -1,11 +1,11 @@
-using MareSynchronos.API.Data;
+using Lumina.Data.Files;
+using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.FileCache;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.UI;
 using MareSynchronos.Utils;
 using Microsoft.Extensions.Logging;
-using Lumina.Data.Files;
 
 namespace MareSynchronos.Services;
 
@@ -14,7 +14,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
     private readonly FileCacheManager _fileCacheManager;
     private CancellationTokenSource? _analysisCts;
     private string _lastDataHash = string.Empty;
-    internal Dictionary<ObjectKind, Dictionary<string, FileDataEntry>> LastAnalysis { get; } = new();
 
     public CharacterAnalyzer(ILogger<CharacterAnalyzer> logger, MareMediator mediator, FileCacheManager fileCacheManager) : base(logger, mediator)
     {
@@ -25,10 +24,10 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
         _fileCacheManager = fileCacheManager;
     }
 
-    public bool IsAnalysisRunning => _analysisCts != null;
-
     public int CurrentFile { get; internal set; }
+    public bool IsAnalysisRunning => _analysisCts != null;
     public int TotalFiles { get; internal set; }
+    internal Dictionary<ObjectKind, Dictionary<string, FileDataEntry>> LastAnalysis { get; } = [];
 
     public void CancelAnalyze()
     {
@@ -74,6 +73,11 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
         if (print) PrintAnalysis();
     }
 
+    public void Dispose()
+    {
+        _analysisCts.CancelDispose();
+    }
+
     private void BaseAnalysis(CharacterData charaData)
     {
         if (string.Equals(charaData.DataHash.Value, _lastDataHash, StringComparison.Ordinal)) return;
@@ -103,7 +107,7 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
                 foreach (var entry in fileCacheEntries)
                 {
                     data[fileEntry.Hash] = new FileDataEntry(fileEntry.Hash, ext,
-                        fileEntry.GamePaths.ToList(),
+                        [.. fileEntry.GamePaths],
                         fileCacheEntries.Select(c => c.ResolvedFilepath).Distinct().ToList(),
                         entry.Size > 0 ? entry.Size.Value : 0, entry.CompressedSize > 0 ? entry.CompressedSize.Value : 0);
                 }
@@ -133,7 +137,7 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
                 {
                     Logger.LogInformation("  Game Path: {path}", path);
                 }
-                if (entry.Value.FilePaths.Count > 1) Logger.LogInformation("  Multiple fitting files detected", entry.Key);
+                if (entry.Value.FilePaths.Count > 1) Logger.LogInformation("  Multiple fitting files detected for {key}", entry.Key);
                 foreach (var filePath in entry.Value.FilePaths)
                 {
                     Logger.LogInformation("  File Path: {path}", filePath);
@@ -163,11 +167,6 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
         Logger.LogInformation("IMPORTANT NOTES:\n\r- For Mare up- and downloads only the compressed size is relevant.\n\r- An unusually high total files count beyond 200 and up will also increase your download time to others significantly.");
     }
 
-    public void Dispose()
-    {
-        _analysisCts.CancelDispose();
-    }
-
     internal sealed record FileDataEntry(string Hash, string FileType, List<string> GamePaths, List<string> FilePaths, long OriginalSize, long CompressedSize)
     {
         public bool IsComputed => OriginalSize > 0 && CompressedSize > 0;
@@ -205,11 +204,10 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
                         {
                             return "Unknown";
                         }
-
                     }
                 default:
                     return string.Empty;
             }
         });
     }
-}
+}

MareSynchronos/Services/CommandManagerService.cs

@@ -5,6 +5,7 @@ using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.UI;
 using MareSynchronos.WebAPI;
+using System.Globalization;
 
 namespace MareSynchronos.Services;
 
@@ -18,15 +19,13 @@ public sealed class CommandManagerService : IDisposable
     private readonly PerformanceCollectorService _performanceCollectorService;
     private readonly PeriodicFileScanner _periodicFileScanner;
     private readonly ServerConfigurationManager _serverConfigurationManager;
-    private readonly UiService _uiService;
 
     public CommandManagerService(ICommandManager commandManager, PerformanceCollectorService performanceCollectorService,
-        UiService uiService, ServerConfigurationManager serverConfigurationManager, PeriodicFileScanner periodicFileScanner,
+        ServerConfigurationManager serverConfigurationManager, PeriodicFileScanner periodicFileScanner,
         ApiController apiController, MareMediator mediator)
     {
         _commandManager = commandManager;
         _performanceCollectorService = performanceCollectorService;
-        _uiService = uiService;
         _serverConfigurationManager = serverConfigurationManager;
         _periodicFileScanner = periodicFileScanner;
         _apiController = apiController;
@@ -49,7 +48,7 @@ public sealed class CommandManagerService : IDisposable
         if (splitArgs == null || splitArgs.Length == 0)
         {
             // Interpret this as toggling the UI
-            _uiService.ToggleMainUi();
+            _mediator.Publish(new UiToggleMessage(typeof(CompactUi)));
             return;
         }
 
@@ -86,7 +85,7 @@ public sealed class CommandManagerService : IDisposable
         }
         else if (string.Equals(splitArgs[0], "perf", StringComparison.OrdinalIgnoreCase))
         {
-            if (splitArgs.Length > 1 && int.TryParse(splitArgs[1], out var limitBySeconds))
+            if (splitArgs.Length > 1 && int.TryParse(splitArgs[1], CultureInfo.InvariantCulture, out var limitBySeconds))
             {
                 _performanceCollectorService.PrintPerformanceStats(limitBySeconds);
             }

MareSynchronos/Services/DalamudUtilService.cs

@@ -17,7 +17,7 @@ namespace MareSynchronos.Services;
 
 public class DalamudUtilService : IHostedService
 {
-    private readonly List<uint> _classJobIdsIgnoredForPets = new() { 30 };
+    private readonly List<uint> _classJobIdsIgnoredForPets = [30];
     private readonly IClientState _clientState;
     private readonly ICondition _condition;
     private readonly IFramework _framework;
@@ -59,6 +59,7 @@ public class DalamudUtilService : IHostedService
     public bool IsInCutscene { get; private set; } = false;
     public bool IsInGpose { get; private set; } = false;
     public bool IsLoggedIn { get; private set; }
+    public bool IsOnFrameworkThread => _framework.IsInFrameworkUpdateThread;
     public bool IsZoning => _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51];
 
     public Lazy<Dictionary<ushort, string>> WorldData { get; private set; }
@@ -74,8 +75,6 @@ public class DalamudUtilService : IHostedService
         return await RunOnFrameworkThread(() => _objectTable.CreateObjectReference(reference)).ConfigureAwait(false);
     }
 
-    public bool IsOnFrameworkThread => _framework.IsInFrameworkUpdateThread;
-
     public void EnsureIsOnFramework()
     {
         if (!_framework.IsInFrameworkUpdateThread) throw new InvalidOperationException("Can only be run on Framework");
@@ -89,13 +88,6 @@ public class DalamudUtilService : IHostedService
         return (Dalamud.Game.ClientState.Objects.Types.Character)objTableObj;
     }
 
-    public Dalamud.Game.ClientState.Objects.Types.Character? GetGposeCharacterFromObjectTableByName(string name, bool onlyGposeCharacters = false)
-    {
-        EnsureIsOnFramework();
-        return (Dalamud.Game.ClientState.Objects.Types.Character?)_objectTable.Where(i => !onlyGposeCharacters || i.ObjectIndex >= 200)
-            .FirstOrDefault(f => f.Name.ToString() == name);
-    }
-
     public unsafe IntPtr GetCompanion(IntPtr? playerPointer = null)
     {
         EnsureIsOnFramework();
@@ -110,6 +102,13 @@ public class DalamudUtilService : IHostedService
         return await RunOnFrameworkThread(() => GetCompanion(playerPointer)).ConfigureAwait(false);
     }
 
+    public Dalamud.Game.ClientState.Objects.Types.Character? GetGposeCharacterFromObjectTableByName(string name, bool onlyGposeCharacters = false)
+    {
+        EnsureIsOnFramework();
+        return (Dalamud.Game.ClientState.Objects.Types.Character?)_objectTable
+            .FirstOrDefault(i => (!onlyGposeCharacters || i.ObjectIndex >= 200) && string.Equals(i.Name.ToString(), name, StringComparison.Ordinal));
+    }
+
     public bool GetIsPlayerPresent()
     {
         EnsureIsOnFramework();
@@ -351,19 +350,18 @@ public class DalamudUtilService : IHostedService
                     if (!isDrawing)
                     {
                         isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
-                        if (isDrawing)
+                        if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal)
+                            && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
                         {
-                            if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal) && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded"))
+                            _lastGlobalBlockPlayer = playerName;
-                            {
+                            _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
-                                _lastGlobalBlockPlayer = playerName;
+                            isDrawingChanged = true;
-                                _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
-                                isDrawingChanged = true;
-                            }
                         }
                     }
                     else
                     {
-                        if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal) && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded"))
+                        if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal)
+                            && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal))
                         {
                             _lastGlobalBlockPlayer = playerName;
                             _lastGlobalBlockReason = "HasModelInSlotLoaded";
@@ -373,7 +371,8 @@ public class DalamudUtilService : IHostedService
                 }
                 else
                 {
-                    if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal) && !string.Equals(_lastGlobalBlockReason, "RenderFlags"))
+                    if (!string.Equals(_lastGlobalBlockPlayer, playerName, StringComparison.Ordinal)
+                        && !string.Equals(_lastGlobalBlockReason, "RenderFlags", StringComparison.Ordinal))
                     {
                         _lastGlobalBlockPlayer = playerName;
                         _lastGlobalBlockReason = "RenderFlags";

MareSynchronos/Services/MareProfileData.cs

@@ -0,0 +1,7 @@
+namespace MareSynchronos.Services;
+
+public record MareProfileData(bool IsFlagged, bool IsNSFW, string Base64ProfilePicture, string Base64SupporterPicture, string Description)
+{
+    public Lazy<byte[]> ImageData { get; } = new Lazy<byte[]>(Convert.FromBase64String(Base64ProfilePicture));
+    public Lazy<byte[]> SupporterImageData { get; } = new Lazy<byte[]>(string.IsNullOrEmpty(Base64SupporterPicture) ? [] : Convert.FromBase64String(Base64SupporterPicture));
+}

MareSynchronos/Services/Mediator/DisposableMediatorSubscriberBase.cs

@@ -10,7 +10,7 @@ public abstract class DisposableMediatorSubscriberBase : MediatorSubscriberBase,
 
     public void Dispose()
     {
-        Dispose(true);
+        Dispose(disposing: true);
         GC.SuppressFinalize(this);
     }
 

MareSynchronos/Services/Mediator/MareMediator.cs

@@ -8,12 +8,12 @@ namespace MareSynchronos.Services.Mediator;
 public sealed class MareMediator : IHostedService
 {
     private readonly object _addRemoveLock = new();
-    private readonly Dictionary<object, DateTime> _lastErrorTime = new();
+    private readonly Dictionary<object, DateTime> _lastErrorTime = [];
     private readonly ILogger<MareMediator> _logger;
     private readonly CancellationTokenSource _loopCts = new();
     private readonly ConcurrentQueue<MessageBase> _messageQueue = new();
     private readonly PerformanceCollectorService _performanceCollector;
-    private readonly Dictionary<Type, HashSet<SubscriberAction>> _subscriberDict = new();
+    private readonly Dictionary<Type, HashSet<SubscriberAction>> _subscriberDict = [];
 
     public MareMediator(ILogger<MareMediator> logger, PerformanceCollectorService performanceCollector)
     {
@@ -23,13 +23,13 @@ public sealed class MareMediator : IHostedService
 
     public void PrintSubscriberInfo()
     {
-        foreach (var kvp in _subscriberDict.SelectMany(c => c.Value.Select(v => v))
+        foreach (var subscriber in _subscriberDict.SelectMany(c => c.Value.Select(v => v.Subscriber))
-            .DistinctBy(p => p.Subscriber).OrderBy(p => p.Subscriber.GetType().FullName, StringComparer.Ordinal).ToList())
+            .DistinctBy(p => p).OrderBy(p => p.GetType().FullName, StringComparer.Ordinal).ToList())
         {
-            _logger.LogInformation("Subscriber {type}: {sub}", kvp.Subscriber.GetType().Name, kvp.Subscriber.ToString());
+            _logger.LogInformation("Subscriber {type}: {sub}", subscriber.GetType().Name, subscriber.ToString());
             StringBuilder sb = new();
             sb.Append("=> ");
-            foreach (var item in _subscriberDict.Where(item => item.Value.Any(v => v.Subscriber == kvp.Subscriber)).ToList())
+            foreach (var item in _subscriberDict.Where(item => item.Value.Any(v => v.Subscriber == subscriber)).ToList())
             {
                 sb.Append(item.Key.Name).Append(", ");
             }
@@ -62,7 +62,7 @@ public sealed class MareMediator : IHostedService
             {
                 await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
 
-                HashSet<MessageBase> processedMessages = new();
+                HashSet<MessageBase> processedMessages = [];
                 while (_messageQueue.TryDequeue(out var message))
                 {
                     if (processedMessages.Contains(message)) { continue; }
@@ -89,7 +89,7 @@ public sealed class MareMediator : IHostedService
     {
         lock (_addRemoveLock)
         {
-            _subscriberDict.TryAdd(typeof(T), new HashSet<SubscriberAction>());
+            _subscriberDict.TryAdd(typeof(T), []);
 
             if (!_subscriberDict[typeof(T)].Add(new(subscriber, action)))
             {
@@ -130,20 +130,22 @@ public sealed class MareMediator : IHostedService
     {
         if (!_subscriberDict.TryGetValue(message.GetType(), out HashSet<SubscriberAction>? subscribers) || subscribers == null || !subscribers.Any()) return;
 
-        HashSet<SubscriberAction> subscribersCopy = new HashSet<SubscriberAction>();
+        HashSet<SubscriberAction> subscribersCopy = [];
         lock (_addRemoveLock)
         {
-            subscribersCopy = subscribers?.Where(s => s.Subscriber != null).ToHashSet() ?? new HashSet<SubscriberAction>();
+            subscribersCopy = subscribers?.Where(s => s.Subscriber != null).ToHashSet() ?? [];
         }
 
         foreach (SubscriberAction subscriber in subscribersCopy)
         {
             try
             {
+#pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
                 typeof(MareMediator)
                     .GetMethod(nameof(ExecuteSubscriber), System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?
                     .MakeGenericMethod(message.GetType())
                     .Invoke(this, new object[] { subscriber, message });
+#pragma warning restore S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
             }
             catch (Exception ex)
             {

MareSynchronos/Services/Mediator/MessageBase.cs

@@ -1,5 +1,6 @@
 namespace MareSynchronos.Services.Mediator;
 
+#pragma warning disable MA0048
 public abstract record MessageBase
 {
     public virtual bool KeepThreadContext => false;
@@ -8,4 +9,5 @@ public abstract record MessageBase
 public record SameThreadMessage : MessageBase
 {
     public override bool KeepThreadContext => true;
-}
+}
+#pragma warning restore MA0048

MareSynchronos/Services/Mediator/Messages.cs

@@ -2,6 +2,7 @@
 using Dalamud.Interface.Internal.Notifications;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Dto;
+using MareSynchronos.API.Dto.Group;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.WebAPI.Files.Models;
@@ -10,6 +11,7 @@ using System.Numerics;
 namespace MareSynchronos.Services.Mediator;
 
 #pragma warning disable MA0048 // File name must match type name
+#pragma warning disable S2094
 public record SwitchToIntroUiMessage : MessageBase;
 public record SwitchToMainUiMessage : MessageBase;
 public record OpenSettingsUiMessage : MessageBase;
@@ -68,5 +70,12 @@ public record CompactUiChange(Vector2 Size, Vector2 Position) : MessageBase;
 public record ProfileOpenStandaloneMessage(Pair Pair) : MessageBase;
 public record RemoveWindowMessage(WindowMediatorSubscriberBase Window) : MessageBase;
 public record PairHandlerVisibleMessage(PairHandler Player) : MessageBase;
+public record RefreshUiMessage : MessageBase;
+public record OpenReportPopupMessage(Pair PairToReport) : MessageBase;
+public record OpenBanUserPopupMessage(Pair PairToBan, GroupFullInfoDto GroupFullInfoDto) : MessageBase;
+public record JoinSyncshellPopupMessage() : MessageBase;
+public record OpenCreateSyncshellPopupMessage() : MessageBase;
+public record OpenSyncshellAdminPanelPopupMessage(GroupFullInfoDto GroupInfo) : MessageBase;
 
+#pragma warning restore S2094
 #pragma warning restore MA0048 // File name must match type name

MareSynchronos/Services/Mediator/WindowMediatorSubscriberBase.cs

@@ -27,7 +27,7 @@ public abstract class WindowMediatorSubscriberBase : Window, IMediatorSubscriber
 
     public void Dispose()
     {
-        Dispose(true);
+        Dispose(disposing: true);
         GC.SuppressFinalize(this);
     }
 

MareSynchronos/Services/PerformanceCollectorService.cs

@@ -121,7 +121,7 @@ public sealed class PerformanceCollectorService : IHostedService
                 DrawSeparator(sb, longestCounterName);
             }
 
-            var pastEntries = limitBySeconds > 0 ? entry.Value.Where(e => e.Item1.AddMinutes(limitBySeconds / 60.0d) >= TimeOnly.FromDateTime(DateTime.Now)).ToList() : entry.Value.ToList();
+            var pastEntries = limitBySeconds > 0 ? entry.Value.Where(e => e.Item1.AddMinutes(limitBySeconds / 60.0d) >= TimeOnly.FromDateTime(DateTime.Now)).ToList() : [.. entry.Value];
 
             if (pastEntries.Any())
             {

MareSynchronos/Services/PluginWarningNotificationService.cs

@@ -35,7 +35,7 @@ public class PluginWarningNotificationService
             };
         }
 
-        List<string> missingPluginsForData = new();
+        List<string> missingPluginsForData = [];
         if (changes.Contains(PlayerChanges.Heels) && !warning.ShownHeelsWarning && !_ipcManager.CheckHeelsApi())
         {
             missingPluginsForData.Add("SimpleHeels");

MareSynchronos/Services/ServerConfiguration/JwtCache.cs

@@ -1,3 +0,0 @@
-namespace MareSynchronos.Services.ServerConfiguration;
-
-public record JwtCache(string ApiUrl, string PlayerName, uint WorldId, string SecretKey);

MareSynchronos/Services/ServerConfiguration/ServerConfigurationManager.cs

@@ -1,5 +1,6 @@
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.MareConfiguration.Models;
+using MareSynchronos.Services.Mediator;
 using MareSynchronos.WebAPI;
 using Microsoft.Extensions.Logging;
 using System.Diagnostics;
@@ -11,18 +12,20 @@ public class ServerConfigurationManager
     private readonly ServerConfigService _configService;
     private readonly DalamudUtilService _dalamudUtil;
     private readonly ILogger<ServerConfigurationManager> _logger;
+    private readonly MareMediator _mareMediator;
     private readonly NotesConfigService _notesConfig;
     private readonly ServerTagConfigService _serverTagConfig;
-    private readonly Dictionary<JwtCache, string> _tokenDictionary = new();
 
     public ServerConfigurationManager(ILogger<ServerConfigurationManager> logger, ServerConfigService configService,
-        ServerTagConfigService serverTagConfig, NotesConfigService notesConfig, DalamudUtilService dalamudUtil)
+        ServerTagConfigService serverTagConfig, NotesConfigService notesConfig, DalamudUtilService dalamudUtil,
+        MareMediator mareMediator)
     {
         _logger = logger;
         _configService = configService;
         _serverTagConfig = serverTagConfig;
         _notesConfig = notesConfig;
         _dalamudUtil = dalamudUtil;
+        _mareMediator = mareMediator;
         EnsureMainExists();
     }
 
@@ -92,7 +95,7 @@ public class ServerConfigurationManager
     {
         try
         {
-            return _configService.Current.ServerStorage.ElementAt(idx);
+            return _configService.Current.ServerStorage[idx];
         }
         catch
         {
@@ -107,20 +110,6 @@ public class ServerConfigurationManager
         return _configService.Current.ServerStorage.Select(v => v.ServerName).ToArray();
     }
 
-    public string? GetToken()
-    {
-        var charaName = _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult();
-        var worldId = _dalamudUtil.GetWorldIdAsync().GetAwaiter().GetResult();
-        var secretKey = GetSecretKey();
-        if (secretKey == null) return null;
-        if (_tokenDictionary.TryGetValue(new JwtCache(CurrentApiUrl, charaName, worldId, secretKey), out var token))
-        {
-            return token;
-        }
-
-        return null;
-    }
-
     public bool HasValidConfig()
     {
         return CurrentServer != null;
@@ -129,19 +118,10 @@ public class ServerConfigurationManager
     public void Save()
     {
         var caller = new StackTrace().GetFrame(1)?.GetMethod()?.ReflectedType?.Name ?? "Unknown";
-        _logger.LogDebug(caller + " Calling config save");
+        _logger.LogDebug("{caller} Calling config save", caller);
         _configService.Save();
     }
 
-    public void SaveToken(string token)
-    {
-        var charaName = _dalamudUtil.GetPlayerNameAsync().GetAwaiter().GetResult();
-        var worldId = _dalamudUtil.GetWorldIdAsync().GetAwaiter().GetResult();
-        var secretKey = GetSecretKey();
-        if (string.IsNullOrEmpty(secretKey)) throw new InvalidOperationException("No secret key set");
-        _tokenDictionary[new JwtCache(CurrentApiUrl, charaName, worldId, secretKey)] = token;
-    }
-
     public void SelectServer(int idx)
     {
         _configService.Current.CurrentServer = idx;
@@ -185,6 +165,7 @@ public class ServerConfigurationManager
     {
         CurrentServerTagStorage().ServerAvailablePairTags.Add(tag);
         _serverTagConfig.Save();
+        _mareMediator.Publish(new RefreshUiMessage());
     }
 
     internal void AddTagForUid(string uid, string tagName)
@@ -192,10 +173,11 @@ public class ServerConfigurationManager
         if (CurrentServerTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
         {
             tags.Add(tagName);
+            _mareMediator.Publish(new RefreshUiMessage());
         }
         else
         {
-            CurrentServerTagStorage().UidServerPairedUserTags[uid] = new() { tagName };
+            CurrentServerTagStorage().UidServerPairedUserTags[uid] = [tagName];
         }
 
         _serverTagConfig.Save();
@@ -295,6 +277,7 @@ public class ServerConfigurationManager
             RemoveTagForUid(uid, tag, save: false);
         }
         _serverTagConfig.Save();
+        _mareMediator.Publish(new RefreshUiMessage());
     }
 
     internal void RemoveTagForUid(string uid, string tagName, bool save = true)
@@ -302,8 +285,23 @@ public class ServerConfigurationManager
         if (CurrentServerTagStorage().UidServerPairedUserTags.TryGetValue(uid, out var tags))
         {
             tags.Remove(tagName);
+
             if (save)
+            {
                 _serverTagConfig.Save();
+                _mareMediator.Publish(new RefreshUiMessage());
+            }
+        }
+    }
+
+    internal void RenameTag(string oldName, string newName)
+    {
+        CurrentServerTagStorage().ServerAvailablePairTags.Remove(oldName);
+        CurrentServerTagStorage().ServerAvailablePairTags.Add(newName);
+        foreach (var existingTags in CurrentServerTagStorage().UidServerPairedUserTags.Select(k => k.Value))
+        {
+            if (existingTags.Remove(oldName))
+                existingTags.Add(newName);
         }
     }
 
@@ -314,6 +312,8 @@ public class ServerConfigurationManager
 
     internal void SetNoteForGid(string gid, string note, bool save = true)
     {
+        if (string.IsNullOrEmpty(gid)) return;
+
         CurrentNotesStorage().GidServerComments[gid] = note;
         if (save)
             _notesConfig.Save();
@@ -321,6 +321,8 @@ public class ServerConfigurationManager
 
     internal void SetNoteForUid(string uid, string note, bool save = true)
     {
+        if (string.IsNullOrEmpty(uid)) return;
+
         CurrentNotesStorage().UidServerComments[uid] = note;
         if (save)
             _notesConfig.Save();

MareSynchronos/Services/UiService.cs

@@ -1,17 +1,17 @@
-using Dalamud.Plugin;
+using Dalamud.Interface.ImGuiFileDialog;
-using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Interface.Windowing;
-using MareSynchronos.UI;
+using Dalamud.Plugin;
 using MareSynchronos.MareConfiguration;
-using MareSynchronos.Services.Mediator;
-using Microsoft.Extensions.Logging;
 using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.UI;
+using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.Services;
 
 public sealed class UiService : DisposableMediatorSubscriberBase
 {
-    private readonly List<WindowMediatorSubscriberBase> _createdWindows = new();
+    private readonly List<WindowMediatorSubscriberBase> _createdWindows = [];
     private readonly DalamudPluginInterface _dalamudPluginInterface;
     private readonly FileDialogManager _fileDialogManager;
     private readonly ILogger<UiService> _logger;
@@ -42,8 +42,8 @@ public sealed class UiService : DisposableMediatorSubscriberBase
 
         Mediator.Subscribe<ProfileOpenStandaloneMessage>(this, (msg) =>
         {
-            if (!_createdWindows.Any(p => p is StandaloneProfileUi
+            if (!_createdWindows.Exists(p => p is StandaloneProfileUi ui
-            && string.Equals(((StandaloneProfileUi)p).Pair.UserData.AliasOrUID, msg.Pair.UserData.AliasOrUID, StringComparison.Ordinal)))
+                && string.Equals(ui.Pair.UserData.AliasOrUID, msg.Pair.UserData.AliasOrUID, StringComparison.Ordinal)))
             {
                 var window = standaloneProfileUiFactory(msg.Pair);
                 _createdWindows.Add(window);
@@ -59,14 +59,6 @@ public sealed class UiService : DisposableMediatorSubscriberBase
         });
     }
 
-    public void ToggleUi()
-    {
-        if (_mareConfigService.Current.HasValidSetup())
-            Mediator.Publish(new UiToggleMessage(typeof(SettingsUi)));
-        else
-            Mediator.Publish(new UiToggleMessage(typeof(IntroUi)));
-    }
-
     public void ToggleMainUi()
     {
         if (_mareConfigService.Current.HasValidSetup())
@@ -75,6 +67,14 @@ public sealed class UiService : DisposableMediatorSubscriberBase
             Mediator.Publish(new UiToggleMessage(typeof(IntroUi)));
     }
 
+    public void ToggleUi()
+    {
+        if (_mareConfigService.Current.HasValidSetup())
+            Mediator.Publish(new UiToggleMessage(typeof(SettingsUi)));
+        else
+            Mediator.Publish(new UiToggleMessage(typeof(IntroUi)));
+    }
+
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);

MareSynchronos/UI/CompactUI.cs

@@ -1,16 +1,12 @@
-using System.Collections.Concurrent;
+using Dalamud.Interface;
-using System.Diagnostics;
-using System.Globalization;
-using System.Numerics;
-using System.Reflection;
-using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
 using ImGuiNET;
 using MareSynchronos.API.Data.Extensions;
-using MareSynchronos.API.Dto.User;
+using MareSynchronos.API.Dto.Group;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.PlayerData.Pairs;
@@ -23,6 +19,10 @@ using MareSynchronos.WebAPI.Files;
 using MareSynchronos.WebAPI.Files.Models;
 using MareSynchronos.WebAPI.SignalR.Utils;
 using Microsoft.Extensions.Logging;
+using System.Collections.Concurrent;
+using System.Globalization;
+using System.Numerics;
+using System.Reflection;
 
 namespace MareSynchronos.UI;
 
@@ -33,18 +33,16 @@ public class CompactUi : WindowMediatorSubscriberBase
     private readonly ApiController _apiController;
     private readonly MareConfigService _configService;
     private readonly ConcurrentDictionary<GameObjectHandler, Dictionary<string, FileDownloadStatus>> _currentDownloads = new();
+    private readonly DrawEntityFactory _drawEntityFactory;
     private readonly FileUploadManager _fileTransferManager;
-    private readonly GroupPanel _groupPanel;
-    private readonly PairGroupsUi _pairGroupsUi;
     private readonly PairManager _pairManager;
-    private readonly SelectGroupForPairUi _selectGroupForPairUi;
+    private readonly SelectTagForPairUi _selectGroupForPairUi;
-    private readonly SelectPairForGroupUi _selectPairsForGroupUi;
+    private readonly SelectPairForTagUi _selectPairsForGroupUi;
     private readonly ServerConfigurationManager _serverManager;
-    private readonly Stopwatch _timeout = new();
+    private readonly TagHandler _tagHandler;
-    private readonly UidDisplayHandler _uidDisplayHandler;
     private readonly UiSharedService _uiShared;
-    private bool _buttonState;
     private string _characterOrCommentFilter = string.Empty;
+    private List<IDrawFolder> _drawFolders;
     private Pair? _lastAddedUser;
     private string _lastAddedUserComment = string.Empty;
     private Vector2 _lastPosition = Vector2.One;
@@ -52,11 +50,12 @@ public class CompactUi : WindowMediatorSubscriberBase
     private string _pairToAdd = string.Empty;
     private int _secretKeyIdx = -1;
     private bool _showModalForUserAddition;
-    private bool _showSyncShells;
     private bool _wasOpen;
 
     public CompactUi(ILogger<CompactUi> logger, UiSharedService uiShared, MareConfigService configService, ApiController apiController, PairManager pairManager,
-        ServerConfigurationManager serverManager, MareMediator mediator, FileUploadManager fileTransferManager, UidDisplayHandler uidDisplayHandler) : base(logger, mediator, "###MareSynchronosMainUI")
+        ServerConfigurationManager serverManager, MareMediator mediator, FileUploadManager fileTransferManager,
+        TagHandler tagHandler, DrawEntityFactory drawEntityFactory, SelectTagForPairUi selectTagForPairUi, SelectPairForTagUi selectPairForTagUi)
+        : base(logger, mediator, "###MareSynchronosMainUI")
     {
         _uiShared = uiShared;
         _configService = configService;
@@ -64,13 +63,12 @@ public class CompactUi : WindowMediatorSubscriberBase
         _pairManager = pairManager;
         _serverManager = serverManager;
         _fileTransferManager = fileTransferManager;
-        _uidDisplayHandler = uidDisplayHandler;
+        _tagHandler = tagHandler;
-        var tagHandler = new TagHandler(_serverManager);
+        _drawEntityFactory = drawEntityFactory;
+        _selectGroupForPairUi = selectTagForPairUi;
+        _selectPairsForGroupUi = selectPairForTagUi;
 
-        _groupPanel = new(this, uiShared, _pairManager, uidDisplayHandler, _serverManager);
+        _drawFolders = GetDrawFolders().ToList();
-        _selectGroupForPairUi = new(tagHandler, uidDisplayHandler);
-        _selectPairsForGroupUi = new(tagHandler, uidDisplayHandler);
-        _pairGroupsUi = new(configService, tagHandler, apiController, _selectPairsForGroupUi);
 
 #if DEBUG
         string dev = "Dev Build";
@@ -87,6 +85,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         Mediator.Subscribe<CutsceneEndMessage>(this, (_) => UiSharedService_GposeEnd());
         Mediator.Subscribe<DownloadStartedMessage>(this, (msg) => _currentDownloads[msg.DownloadId] = msg.DownloadStatus);
         Mediator.Subscribe<DownloadFinishedMessage>(this, (msg) => _currentDownloads.TryRemove(msg.DownloadId, out _));
+        Mediator.Subscribe<RefreshUiMessage>(this, (msg) => _drawFolders = GetDrawFolders().ToList());
 
         Flags |= ImGuiWindowFlags.NoDocking;
 
@@ -107,8 +106,11 @@ public class CompactUi : WindowMediatorSubscriberBase
             var unsupported = "UNSUPPORTED VERSION";
             var uidTextSize = ImGui.CalcTextSize(unsupported);
             ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMax().X + ImGui.GetWindowContentRegionMin().X) / 2 - uidTextSize.X / 2);
-            ImGui.TextColored(ImGuiColors.DalamudRed, unsupported);
+            using (ImRaii.PushFont(_uiShared.UidFont, _uiShared.UidFontBuilt))
-            if (_uiShared.UidFontBuilt) ImGui.PopFont();
+            {
+                ImGui.AlignTextToFramePadding();
+                ImGui.TextColored(ImGuiColors.DalamudRed, unsupported);
+            }
             UiSharedService.ColorTextWrapped($"Your Mare Synchronos installation is out of date, the current version is {ver.Major}.{ver.Minor}.{ver.Build}. " +
                 $"It is highly recommended to keep Mare Synchronos up to date. Open /xlplugins and update the plugin.", ImGuiColors.DalamudRed);
         }
@@ -116,55 +118,12 @@ public class CompactUi : WindowMediatorSubscriberBase
         UiSharedService.DrawWithID("header", DrawUIDHeader);
         ImGui.Separator();
         UiSharedService.DrawWithID("serverstatus", DrawServerStatus);
+        ImGui.Separator();
 
         if (_apiController.ServerState is ServerState.Connected)
         {
-            var hasShownSyncShells = _showSyncShells;
+            UiSharedService.DrawWithID("pairlist", DrawPairList);
 
-            ImGui.PushFont(UiBuilder.IconFont);
-            if (!hasShownSyncShells)
-            {
-                ImGui.PushStyleColor(ImGuiCol.Button, ImGui.GetStyle().Colors[(int)ImGuiCol.ButtonHovered]);
-            }
-            if (ImGui.Button(FontAwesomeIcon.User.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
-            {
-                _showSyncShells = false;
-            }
-            if (!hasShownSyncShells)
-            {
-                ImGui.PopStyleColor();
-            }
-            ImGui.PopFont();
-            UiSharedService.AttachToolTip("Individual pairs");
-
-            ImGui.SameLine();
-
-            ImGui.PushFont(UiBuilder.IconFont);
-            if (hasShownSyncShells)
-            {
-                ImGui.PushStyleColor(ImGuiCol.Button, ImGui.GetStyle().Colors[(int)ImGuiCol.ButtonHovered]);
-            }
-            if (ImGui.Button(FontAwesomeIcon.UserFriends.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
-            {
-                _showSyncShells = true;
-            }
-            if (hasShownSyncShells)
-            {
-                ImGui.PopStyleColor();
-            }
-            ImGui.PopFont();
-
-            UiSharedService.AttachToolTip("Syncshells");
-
-            ImGui.Separator();
-            if (!hasShownSyncShells)
-            {
-                UiSharedService.DrawWithID("pairlist", DrawPairList);
-            }
-            else
-            {
-                UiSharedService.DrawWithID("syncshells", _groupPanel.DrawSyncshells);
-            }
             ImGui.Separator();
             UiSharedService.DrawWithID("transfers", DrawTransfers);
             TransferPartHeight = ImGui.GetCursorPosY() - TransferPartHeight;
@@ -213,12 +172,6 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
     }
 
-    public override void OnClose()
-    {
-        _uidDisplayHandler.Clear();
-        base.OnClose();
-    }
-
     private void DrawAddCharacter()
     {
         ImGui.Dummy(new(10));
@@ -237,7 +190,7 @@ public class CompactUi : WindowMediatorSubscriberBase
 
                 _serverManager.Save();
 
-                _ = _apiController.CreateConnections(forceGetToken: true);
+                _ = _apiController.CreateConnections();
             }
 
             _uiShared.DrawCombo("Secret Key##addCharacterSecretKey", keys, (f) => f.Value.FriendlyName, (f) => _secretKeyIdx = f.Key);
@@ -250,18 +203,15 @@ public class CompactUi : WindowMediatorSubscriberBase
 
     private void DrawAddPair()
     {
-        var buttonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Plus);
+        var buttonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.UserPlus);
-        ImGui.SetNextItemWidth(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X - buttonSize.X);
+        var usersButtonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Users);
+        ImGui.SetNextItemWidth(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X - buttonSize.X - ImGui.GetStyle().ItemSpacing.X - usersButtonSize.X);
         ImGui.InputTextWithHint("##otheruid", "Other players UID/Alias", ref _pairToAdd, 20);
-        ImGui.SameLine(ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth() - buttonSize.X);
+        ImGui.SameLine();
-        var canAdd = !_pairManager.DirectPairs.Any(p => string.Equals(p.UserData.UID, _pairToAdd, StringComparison.Ordinal) || string.Equals(p.UserData.Alias, _pairToAdd, StringComparison.Ordinal));
+        var alreadyExisting = _pairManager.DirectPairs.Exists(p => string.Equals(p.UserData.UID, _pairToAdd, StringComparison.Ordinal) || string.Equals(p.UserData.Alias, _pairToAdd, StringComparison.Ordinal));
-        if (!canAdd)
+        using (ImRaii.Disabled(alreadyExisting || string.IsNullOrEmpty(_pairToAdd)))
         {
-            ImGuiComponents.DisabledButton(FontAwesomeIcon.Plus);
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.UserPlus))
-        }
-        else
-        {
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
             {
                 _ = _apiController.UserAddPair(new(new(_pairToAdd)));
                 _pairToAdd = string.Empty;
@@ -269,95 +219,48 @@ public class CompactUi : WindowMediatorSubscriberBase
             UiSharedService.AttachToolTip("Pair with " + (_pairToAdd.IsNullOrEmpty() ? "other user" : _pairToAdd));
         }
 
+        ImGui.SameLine();
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Users))
+        {
+            ImGui.OpenPopup("Syncshell Menu");
+        }
+        UiSharedService.AttachToolTip("Syncshell Menu");
+
+        if (ImGui.BeginPopup("Syncshell Menu"))
+        {
+            using (ImRaii.Disabled(_pairManager.GroupPairs.Select(k => k.Key).Distinct()
+                .Count(g => string.Equals(g.OwnerUID, _apiController.UID, StringComparison.Ordinal)) >= _apiController.ServerInfo.MaxGroupsCreatedByUser))
+            {
+                if (UiSharedService.IconTextButton(FontAwesomeIcon.Plus, "Create new Syncshell", _syncshellMenuSize, true))
+                {
+                    Mediator.Publish(new OpenCreateSyncshellPopupMessage());
+                    ImGui.CloseCurrentPopup();
+                }
+            }
+
+            using (ImRaii.Disabled(_pairManager.GroupPairs.Select(k => k.Key).Distinct().Count() >= _apiController.ServerInfo.MaxGroupsJoinedByUser))
+            {
+                if (UiSharedService.IconTextButton(FontAwesomeIcon.Users, "Join existing Syncshell", _syncshellMenuSize, true))
+                {
+                    Mediator.Publish(new JoinSyncshellPopupMessage());
+                    ImGui.CloseCurrentPopup();
+                }
+            }
+            _syncshellMenuSize = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
+            ImGui.EndPopup();
+        }
+
         ImGuiHelpers.ScaledDummy(2);
     }
 
+    private float _syncshellMenuSize = 0;
+
     private void DrawFilter()
     {
-        var buttonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.ArrowUp);
+        ImGui.SetNextItemWidth(WindowContentWidth);
-        var playButtonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Play);
+        if (ImGui.InputTextWithHint("##filter", "Filter for UID/notes", ref _characterOrCommentFilter, 255))
-        if (!_configService.Current.ReverseUserSort)
         {
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.ArrowDown))
+            Mediator.Publish(new RefreshUiMessage());
-            {
-                _configService.Current.ReverseUserSort = true;
-                _configService.Save();
-            }
-            UiSharedService.AttachToolTip("Sort by name descending");
-        }
-        else
-        {
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.ArrowUp))
-            {
-                _configService.Current.ReverseUserSort = false;
-                _configService.Save();
-            }
-            UiSharedService.AttachToolTip("Sort by name ascending");
-        }
-        ImGui.SameLine();
-
-        var users = GetFilteredUsers();
-        var userCount = users.Count;
-
-        var spacing = userCount > 0
-            ? playButtonSize.X + ImGui.GetStyle().ItemSpacing.X * 2
-            : ImGui.GetStyle().ItemSpacing.X;
-
-        ImGui.SetNextItemWidth(WindowContentWidth - buttonSize.X - spacing);
-        ImGui.InputTextWithHint("##filter", "Filter for UID/notes", ref _characterOrCommentFilter, 255);
-
-        if (userCount == 0) return;
-
-        var pausedUsers = users.Where(u => u.UserPair!.OwnPermissions.IsPaused() && u.UserPair.OtherPermissions.IsPaired()).ToList();
-        var resumedUsers = users.Where(u => !u.UserPair!.OwnPermissions.IsPaused() && u.UserPair.OtherPermissions.IsPaired()).ToList();
-
-        if (!pausedUsers.Any() && !resumedUsers.Any()) return;
-        ImGui.SameLine();
-
-        switch (_buttonState)
-        {
-            case true when !pausedUsers.Any():
-                _buttonState = false;
-                break;
-
-            case false when !resumedUsers.Any():
-                _buttonState = true;
-                break;
-
-            case true:
-                users = pausedUsers;
-                break;
-
-            case false:
-                users = resumedUsers;
-                break;
-        }
-
-        var button = _buttonState ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
-
-        if (!_timeout.IsRunning || _timeout.ElapsedMilliseconds > 15000)
-        {
-            _timeout.Reset();
-
-            if (ImGuiComponents.IconButton(button) && UiSharedService.CtrlPressed())
-            {
-                foreach (var entry in users)
-                {
-                    var perm = entry.UserPair!.OwnPermissions;
-                    perm.SetPaused(!perm.IsPaused());
-                    _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(entry.UserData, perm));
-                }
-
-                _timeout.Start();
-                _buttonState = !_buttonState;
-            }
-            UiSharedService.AttachToolTip($"Hold Control to {(button == FontAwesomeIcon.Play ? "resume" : "pause")} pairing with {users.Count} out of {userCount} displayed users.");
-        }
-        else
-        {
-            var availableAt = (15000 - _timeout.ElapsedMilliseconds) / 1000;
-            ImGuiComponents.DisabledButton(button);
-            UiSharedService.AttachToolTip($"Next execution is available at {availableAt} seconds");
         }
     }
 
@@ -374,24 +277,13 @@ public class CompactUi : WindowMediatorSubscriberBase
         var ySize = TransferPartHeight == 0
             ? 1
             : (ImGui.GetWindowContentRegionMax().Y - ImGui.GetWindowContentRegionMin().Y) - TransferPartHeight - ImGui.GetCursorPosY();
-        var users = GetFilteredUsers()
-            .OrderBy(
-                u => _configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(u.PlayerName)
-                    ? (_configService.Current.PreferNotesOverNamesForVisible ? u.GetNote() : u.PlayerName)
-                    : (u.GetNote() ?? u.UserData.AliasOrUID), StringComparer.OrdinalIgnoreCase).ToList();
-
-        if (_configService.Current.ReverseUserSort)
-        {
-            users.Reverse();
-        }
-
-        var onlineUsers = users.Where(u => u.IsOnline || u.UserPair!.OwnPermissions.IsPaused()).Select(c => new DrawUserPair("Online" + c.UserData.UID, c, _uidDisplayHandler, _apiController, _selectGroupForPairUi)).ToList();
-        var visibleUsers = users.Where(u => u.IsVisible).Select(c => new DrawUserPair("Visible" + c.UserData.UID, c, _uidDisplayHandler, _apiController, _selectGroupForPairUi)).ToList();
-        var offlineUsers = users.Where(u => !u.IsOnline && !u.UserPair!.OwnPermissions.IsPaused()).Select(c => new DrawUserPair("Offline" + c.UserData.UID, c, _uidDisplayHandler, _apiController, _selectGroupForPairUi)).ToList();
 
         ImGui.BeginChild("list", new Vector2(WindowContentWidth, ySize), border: false);
 
-        _pairGroupsUi.Draw(visibleUsers, onlineUsers, offlineUsers);
+        foreach (var item in _drawFolders)
+        {
+            item.Draw();
+        }
 
         ImGui.EndChild();
     }
@@ -417,7 +309,7 @@ public class CompactUi : WindowMediatorSubscriberBase
             ImGui.TextColored(ImGuiColors.ParsedGreen, userCount);
             ImGui.SameLine();
             if (!printShard) ImGui.AlignTextToFramePadding();
-            ImGui.Text("Users Online");
+            ImGui.TextUnformatted("Users Online");
         }
         else
         {
@@ -474,7 +366,7 @@ public class CompactUi : WindowMediatorSubscriberBase
     {
         var currentUploads = _fileTransferManager.CurrentUploads.ToList();
         ImGui.PushFont(UiBuilder.IconFont);
-        ImGui.Text(FontAwesomeIcon.Upload.ToIconString());
+        ImGui.TextUnformatted(FontAwesomeIcon.Upload.ToIconString());
         ImGui.PopFont();
         ImGui.SameLine(35 * ImGuiHelpers.GlobalScale);
 
@@ -486,20 +378,20 @@ public class CompactUi : WindowMediatorSubscriberBase
             var totalUploaded = currentUploads.Sum(c => c.Transferred);
             var totalToUpload = currentUploads.Sum(c => c.Total);
 
-            ImGui.Text($"{doneUploads}/{totalUploads}");
+            ImGui.TextUnformatted($"{doneUploads}/{totalUploads}");
             var uploadText = $"({UiSharedService.ByteToString(totalUploaded)}/{UiSharedService.ByteToString(totalToUpload)})";
             var textSize = ImGui.CalcTextSize(uploadText);
             ImGui.SameLine(WindowContentWidth - textSize.X);
-            ImGui.Text(uploadText);
+            ImGui.TextUnformatted(uploadText);
         }
         else
         {
-            ImGui.Text("No uploads in progress");
+            ImGui.TextUnformatted("No uploads in progress");
         }
 
         var currentDownloads = _currentDownloads.SelectMany(d => d.Value.Values).ToList();
         ImGui.PushFont(UiBuilder.IconFont);
-        ImGui.Text(FontAwesomeIcon.Download.ToIconString());
+        ImGui.TextUnformatted(FontAwesomeIcon.Download.ToIconString());
         ImGui.PopFont();
         ImGui.SameLine(35 * ImGuiHelpers.GlobalScale);
 
@@ -510,16 +402,16 @@ public class CompactUi : WindowMediatorSubscriberBase
             var totalDownloaded = currentDownloads.Sum(c => c.TransferredBytes);
             var totalToDownload = currentDownloads.Sum(c => c.TotalBytes);
 
-            ImGui.Text($"{doneDownloads}/{totalDownloads}");
+            ImGui.TextUnformatted($"{doneDownloads}/{totalDownloads}");
             var downloadText =
                 $"({UiSharedService.ByteToString(totalDownloaded)}/{UiSharedService.ByteToString(totalToDownload)})";
             var textSize = ImGui.CalcTextSize(downloadText);
             ImGui.SameLine(WindowContentWidth - textSize.X);
-            ImGui.Text(downloadText);
+            ImGui.TextUnformatted(downloadText);
         }
         else
         {
-            ImGui.Text("No downloads in progress");
+            ImGui.TextUnformatted("No downloads in progress");
         }
 
         if (UiSharedService.IconTextButton(FontAwesomeIcon.PersonCircleQuestion, "Mare Character Data Analysis", WindowContentWidth))
@@ -583,15 +475,119 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
     }
 
-    private List<Pair> GetFilteredUsers()
+    private IEnumerable<IDrawFolder> GetDrawFolders()
     {
-        return _pairManager.DirectPairs.Where(p =>
+        List<IDrawFolder> drawFolders = [];
+
+        var users = GetFilteredGroupUsers()
+            .ToDictionary(g => g.Key, g => g.Value);
+
+        if (_configService.Current.ShowVisibleUsersSeparately)
+        {
+            var visibleUsers = users.Where(u => u.Key.IsVisible)
+            .OrderBy(
+                    u => _configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(u.Key.PlayerName)
+                        ? (_configService.Current.PreferNotesOverNamesForVisible ? u.Key.GetNote() : u.Key.PlayerName)
+                        : (u.Key.GetNote() ?? u.Key.UserData.AliasOrUID), StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(k => k.Key, k => k.Value);
+
+            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomVisibleTag, visibleUsers));
+        }
+
+        List<IDrawFolder> groupFolders = new();
+        foreach (var group in _pairManager.GroupPairs.Select(g => g.Key).OrderBy(g => g.GroupAliasOrGID, StringComparer.Ordinal))
+        {
+            var groupUsers2 = users.Where(v => v.Value.Exists(g => string.Equals(g.GID, group.GID, StringComparison.Ordinal))
+                    && (v.Key.IsOnline || (!v.Key.IsOnline && !_configService.Current.ShowOfflineUsersSeparately)
+                    || v.Key.UserPair.OwnPermissions.IsPaused()))
+                    .OrderByDescending(u => u.Key.IsOnline)
+                    .ThenBy(u =>
+                    {
+                        if (string.Equals(u.Key.UserData.UID, group.OwnerUID, StringComparison.Ordinal)) return 0;
+                        if (group.GroupPairUserInfos.TryGetValue(u.Key.UserData.UID, out var info))
+                        {
+                            if (info.IsModerator()) return 1;
+                            if (info.IsPinned()) return 2;
+                        }
+                        return u.Key.IsVisible ? 3 : 4;
+                    })
+                    .ThenBy(
+                    u => _configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(u.Key.PlayerName)
+                        ? (_configService.Current.PreferNotesOverNamesForVisible ? u.Key.GetNote() : u.Key.PlayerName)
+                        : (u.Key.GetNote() ?? u.Key.UserData.AliasOrUID), StringComparer.Ordinal)
+                    .ToDictionary(k => k.Key, k => k.Value);
+
+            groupFolders.Add(_drawEntityFactory.CreateDrawGroupFolder(group, groupUsers2));
+        }
+
+        if (_configService.Current.GroupUpSyncshells)
+            drawFolders.Add(new DrawGroupedGroupFolder(groupFolders, _tagHandler));
+        else
+            drawFolders.AddRange(groupFolders);
+
+        var tags = _tagHandler.GetAllTagsSorted();
+        HashSet<Pair> alreadyInTags = [];
+        foreach (var tag in tags)
+        {
+            var tagUsers = users.Where(u => u.Key.IsDirectlyPaired && !u.Key.IsOneSidedPair && _tagHandler.HasTag(u.Key.UserData.UID, tag)
+                && (u.Key.IsOnline || (!u.Key.IsOnline && !_configService.Current.ShowOfflineUsersSeparately)
+                || u.Key.UserPair.OwnPermissions.IsPaused()))
+                .OrderByDescending(u => u.Key.IsVisible)
+                .ThenByDescending(u => u.Key.IsOnline)
+                .ThenBy(
+                    u => _configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(u.Key.PlayerName)
+                        ? (_configService.Current.PreferNotesOverNamesForVisible ? u.Key.GetNote() : u.Key.PlayerName)
+                        : (u.Key.GetNote() ?? u.Key.UserData.AliasOrUID), StringComparer.OrdinalIgnoreCase)
+                .ToDictionary(u => u.Key, u => u.Value);
+
+            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(tag, tagUsers.Select(u =>
+            {
+                alreadyInTags.Add(u.Key);
+                return (u.Key, u.Value);
+            }).ToDictionary(u => u.Key, u => u.Value)));
+        }
+
+        var onlineDirectPairedUsersNotInTags = users.Where(u => u.Key.IsDirectlyPaired && !u.Key.IsOneSidedPair && !_tagHandler.HasAnyTag(u.Key.UserData.UID)
+            && (u.Key.IsOnline || (!u.Key.IsOnline && !_configService.Current.ShowOfflineUsersSeparately)
+                || u.Key.UserPair.OwnPermissions.IsPaused()))
+            .OrderByDescending(u => u.Key.IsVisible)
+            .ThenByDescending(u => u.Key.IsOnline)
+            .ThenBy(
+                u => _configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(u.Key.PlayerName)
+                    ? (_configService.Current.PreferNotesOverNamesForVisible ? u.Key.GetNote() : u.Key.PlayerName)
+                    : (u.Key.GetNote() ?? u.Key.UserData.AliasOrUID), StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(u => u.Key, u => u.Value);
+
+        drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder((_configService.Current.ShowOfflineUsersSeparately ? TagHandler.CustomOnlineTag : TagHandler.CustomAllTag),
+            onlineDirectPairedUsersNotInTags));
+
+        if (_configService.Current.ShowOfflineUsersSeparately)
+        {
+            var offlineUsersEntries = users.Where(u => (!u.Key.IsOneSidedPair || u.Value.Any()) && !u.Key.IsOnline && !u.Key.UserPair.OwnPermissions.IsPaused()).OrderBy(
+                u => _configService.Current.ShowCharacterNameInsteadOfNotesForVisible && !string.IsNullOrEmpty(u.Key.PlayerName)
+                    ? (_configService.Current.PreferNotesOverNamesForVisible ? u.Key.GetNote() : u.Key.PlayerName)
+                    : (u.Key.GetNote() ?? u.Key.UserData.AliasOrUID), StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(u => u.Key, u => u.Value);
+
+            drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomOfflineTag, offlineUsersEntries));
+        }
+
+        drawFolders.Add(_drawEntityFactory.CreateDrawTagFolder(TagHandler.CustomUnpairedTag, users.Where(u => u.Key.IsOneSidedPair).ToDictionary(u => u.Key, u => u.Value)));
+
+        return drawFolders;
+    }
+
+    private Dictionary<Pair, List<GroupFullInfoDto>> GetFilteredGroupUsers()
+    {
+        if (string.IsNullOrEmpty(_characterOrCommentFilter)) return _pairManager.PairsWithGroups;
+
+        return _pairManager.PairsWithGroups.Where(p =>
         {
             if (_characterOrCommentFilter.IsNullOrEmpty()) return true;
-            return p.UserData.AliasOrUID.Contains(_characterOrCommentFilter, StringComparison.OrdinalIgnoreCase) ||
+            return p.Key.UserData.AliasOrUID.Contains(_characterOrCommentFilter, StringComparison.OrdinalIgnoreCase) ||
-                   (p.GetNote()?.Contains(_characterOrCommentFilter, StringComparison.OrdinalIgnoreCase) ?? false) ||
+                   (p.Key.GetNote()?.Contains(_characterOrCommentFilter, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                   (p.PlayerName?.Contains(_characterOrCommentFilter, StringComparison.OrdinalIgnoreCase) ?? false);
+                   (p.Key.PlayerName?.Contains(_characterOrCommentFilter, StringComparison.OrdinalIgnoreCase) ?? false);
-        }).ToList();
+        }).ToDictionary(k => k.Key, k => k.Value);
     }
 
     private string GetServerError()

MareSynchronos/UI/Components/DrawFolderBase.cs

@@ -0,0 +1,116 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Components;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.UI.Handlers;
+
+namespace MareSynchronos.UI.Components;
+
+public abstract class DrawFolderBase : IDrawFolder
+{
+    protected readonly IEnumerable<DrawUserPair> _drawPairs;
+    protected readonly string _id;
+    protected readonly TagHandler _tagHandler;
+    private float _menuWidth = -1;
+    protected DrawFolderBase(string id, IEnumerable<DrawUserPair> drawPairs, TagHandler tagHandler)
+    {
+        _id = id;
+        _drawPairs = drawPairs;
+        _tagHandler = tagHandler;
+    }
+
+    protected abstract bool RenderIfEmpty { get; }
+    protected abstract bool RenderMenu { get; }
+
+    public void Draw()
+    {
+        if (!RenderIfEmpty && !_drawPairs.Any()) return;
+
+        using var id = ImRaii.PushId("folder_" + _id);
+        var originalY = ImGui.GetCursorPosY();
+        var pauseIconSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars);
+        var textSize = ImGui.CalcTextSize(_id);
+        var textPosY = originalY + pauseIconSize.Y / 2 - textSize.Y / 2;
+
+        // draw opener
+        var icon = _tagHandler.IsTagOpen(_id) ? FontAwesomeIcon.CaretDown : FontAwesomeIcon.CaretRight;
+        ImGui.SetCursorPosY(textPosY);
+        UiSharedService.FontText(icon.ToIconString(), UiBuilder.IconFont);
+        if (ImGui.IsItemClicked())
+        {
+            _tagHandler.SetTagOpen(_id, !_tagHandler.IsTagOpen(_id));
+        }
+
+        ImGui.SameLine();
+        var leftSideEnd = DrawIcon(textPosY, originalY);
+
+        ImGui.SameLine();
+        var rightSideStart = DrawRightSide(originalY);
+
+        // draw name
+        ImGui.SameLine(leftSideEnd);
+        DrawName(textPosY, rightSideStart - leftSideEnd);
+        ImGui.Separator();
+
+        // if opened draw content
+        if (_tagHandler.IsTagOpen(_id))
+        {
+            using var indent = ImRaii.PushIndent(20f);
+            if (_drawPairs.Any())
+            {
+                foreach (var item in _drawPairs)
+                {
+                    item.DrawPairedClient();
+                }
+            }
+            else
+            {
+                ImGui.TextUnformatted("No users (online)");
+            }
+
+            ImGui.Separator();
+        }
+    }
+
+    protected abstract float DrawIcon(float textPosY, float originalY);
+
+    protected abstract void DrawMenu(float menuWidth);
+
+    protected abstract void DrawName(float originalY, float width);
+
+    protected abstract float DrawRightSide(float originalY, float currentRightSideX);
+
+    private float DrawRightSide(float originalY)
+    {
+        var barButtonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars);
+        var spacingX = ImGui.GetStyle().ItemSpacing.X;
+        var windowEndX = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth();
+
+        // Flyout Menu
+        var rightSideStart = windowEndX - (RenderMenu ? (barButtonSize.X + spacingX) : spacingX);
+
+        if (RenderMenu)
+        {
+            ImGui.SameLine(windowEndX - barButtonSize.X);
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Bars))
+            {
+                ImGui.OpenPopup("User Flyout Menu");
+            }
+            if (ImGui.BeginPopup("User Flyout Menu"))
+            {
+                UiSharedService.DrawWithID($"buttons-{_id}", () =>
+                {
+                    DrawMenu(_menuWidth);
+                });
+                _menuWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
+                ImGui.EndPopup();
+            }
+            else
+            {
+                _menuWidth = 0;
+            }
+        }
+
+        return DrawRightSide(originalY, rightSideStart);
+    }
+}

MareSynchronos/UI/Components/DrawFolderGroup.cs

@@ -0,0 +1,236 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Components;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.UI.Handlers;
+using MareSynchronos.WebAPI;
+
+namespace MareSynchronos.UI.Components;
+
+public class DrawFolderGroup : DrawFolderBase
+{
+    private readonly ApiController _apiController;
+    private readonly GroupFullInfoDto _groupFullInfoDto;
+    private readonly IdDisplayHandler _idDisplayHandler;
+    private readonly MareMediator _mareMediator;
+
+    public DrawFolderGroup(string id, GroupFullInfoDto groupFullInfoDto, ApiController apiController,
+        IEnumerable<DrawUserPair> drawPairs, TagHandler tagHandler, IdDisplayHandler idDisplayHandler,
+        MareMediator mareMediator) :
+        base(id, drawPairs, tagHandler)
+    {
+        _groupFullInfoDto = groupFullInfoDto;
+        _apiController = apiController;
+        _idDisplayHandler = idDisplayHandler;
+        _mareMediator = mareMediator;
+    }
+
+    protected override bool RenderIfEmpty => true;
+    protected override bool RenderMenu => true;
+    private bool IsModerator => IsOwner || _groupFullInfoDto.GroupUserInfo.IsModerator();
+    private bool IsOwner => string.Equals(_groupFullInfoDto.OwnerUID, _apiController.UID, StringComparison.Ordinal);
+    private bool IsPinned => _groupFullInfoDto.GroupUserInfo.IsPinned();
+
+    protected override float DrawIcon(float textPosY, float originalY)
+    {
+        ImGui.SetCursorPosY(textPosY);
+        using (ImRaii.PushFont(UiBuilder.IconFont))
+            ImGui.TextUnformatted(_groupFullInfoDto.GroupPermissions.IsDisableInvites() ? FontAwesomeIcon.Lock.ToIconString() : FontAwesomeIcon.Users.ToIconString());
+        if (_groupFullInfoDto.GroupPermissions.IsDisableInvites())
+        {
+            UiSharedService.AttachToolTip("Syncshell " + _groupFullInfoDto.GroupAliasOrGID + " is closed for invites");
+        }
+        if (IsOwner)
+        {
+            ImGui.SameLine();
+            ImGui.SetCursorPosY(textPosY);
+            using (ImRaii.PushFont(UiBuilder.IconFont))
+                ImGui.TextUnformatted(FontAwesomeIcon.Crown.ToIconString());
+            UiSharedService.AttachToolTip("You are the owner of " + _groupFullInfoDto.GroupAliasOrGID);
+        }
+        else if (IsModerator)
+        {
+            ImGui.SameLine();
+            ImGui.SetCursorPosY(textPosY);
+            using (ImRaii.PushFont(UiBuilder.IconFont))
+                ImGui.TextUnformatted(FontAwesomeIcon.UserShield.ToIconString());
+            UiSharedService.AttachToolTip("You are a moderator in " + _groupFullInfoDto.GroupAliasOrGID);
+        }
+        else if (IsPinned)
+        {
+            ImGui.SameLine();
+            ImGui.SetCursorPosY(textPosY);
+            using (ImRaii.PushFont(UiBuilder.IconFont))
+                ImGui.TextUnformatted(FontAwesomeIcon.Thumbtack.ToIconString());
+            UiSharedService.AttachToolTip("You are pinned in " + _groupFullInfoDto.GroupAliasOrGID);
+        }
+        ImGui.SameLine();
+        return ImGui.GetCursorPosX();
+    }
+
+    protected override void DrawMenu(float menuWidth)
+    {
+        ImGui.TextUnformatted("Syncshell Menu (" + _groupFullInfoDto.GroupAliasOrGID + ")");
+        ImGui.Separator();
+
+        ImGui.TextUnformatted("General Syncshell Actions");
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.Copy, "Copy ID", menuWidth, true))
+        {
+            ImGui.CloseCurrentPopup();
+            ImGui.SetClipboardText(_groupFullInfoDto.GroupAliasOrGID);
+        }
+        UiSharedService.AttachToolTip("Copy Syncshell ID to Clipboard");
+
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.StickyNote, "Copy Notes", menuWidth, true))
+        {
+            ImGui.CloseCurrentPopup();
+            ImGui.SetClipboardText(UiSharedService.GetNotes(_drawPairs.Select(k => k.Pair).ToList()));
+        }
+        UiSharedService.AttachToolTip("Copies all your notes for all users in this Syncshell to the clipboard." + Environment.NewLine + "They can be imported via Settings -> Privacy -> Import Notes from Clipboard");
+
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.ArrowCircleLeft, "Leave Syncshell", menuWidth, true) && UiSharedService.CtrlPressed())
+        {
+            _ = _apiController.GroupLeave(_groupFullInfoDto);
+            ImGui.CloseCurrentPopup();
+        }
+        UiSharedService.AttachToolTip("Hold CTRL and click to leave this Syncshell" + (!string.Equals(_groupFullInfoDto.OwnerUID, _apiController.UID, StringComparison.Ordinal)
+            ? string.Empty : Environment.NewLine + "WARNING: This action is irreversible" + Environment.NewLine + "Leaving an owned Syncshell will transfer the ownership to a random person in the Syncshell."));
+
+        ImGui.Separator();
+        ImGui.TextUnformatted("Permission Settings");
+        var perm = _groupFullInfoDto.GroupUserPermissions;
+        bool disableSounds = perm.IsDisableSounds();
+        bool disableAnims = perm.IsDisableAnimations();
+        bool disableVfx = perm.IsDisableVFX();
+
+        if ((_groupFullInfoDto.GroupPermissions.IsPreferDisableAnimations() != disableAnims
+            || _groupFullInfoDto.GroupPermissions.IsPreferDisableSounds() != disableSounds
+            || _groupFullInfoDto.GroupPermissions.IsPreferDisableVFX() != disableVfx)
+            && UiSharedService.IconTextButton(FontAwesomeIcon.Check, "Align with suggested permissions", menuWidth, true))
+        {
+            perm.SetDisableVFX(_groupFullInfoDto.GroupPermissions.IsPreferDisableVFX());
+            perm.SetDisableSounds(_groupFullInfoDto.GroupPermissions.IsPreferDisableSounds());
+            perm.SetDisableAnimations(_groupFullInfoDto.GroupPermissions.IsPreferDisableAnimations());
+            _ = _apiController.GroupChangeIndividualPermissionState(new(_groupFullInfoDto.Group, new(_apiController.UID), perm));
+            ImGui.CloseCurrentPopup();
+        }
+
+        if (UiSharedService.IconTextButton(disableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeOff, disableSounds ? "Enable Sound Sync" : "Disable Sound Sync",
+            menuWidth, true))
+        {
+            perm.SetDisableSounds(!disableSounds);
+            _ = _apiController.GroupChangeIndividualPermissionState(new(_groupFullInfoDto.Group, new(_apiController.UID), perm));
+            ImGui.CloseCurrentPopup();
+        }
+
+        if (UiSharedService.IconTextButton(disableAnims ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop, disableAnims ? "Enable Animation Sync" : "Disable Animation Sync",
+            menuWidth, true))
+        {
+            perm.SetDisableAnimations(!disableAnims);
+            _ = _apiController.GroupChangeIndividualPermissionState(new(_groupFullInfoDto.Group, new(_apiController.UID), perm));
+            ImGui.CloseCurrentPopup();
+        }
+
+        if (UiSharedService.IconTextButton(disableVfx ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle, disableVfx ? "Enable VFX Sync" : "Disable VFX Sync", 
+            menuWidth, true))
+        {
+            perm.SetDisableVFX(!disableVfx);
+            _ = _apiController.GroupChangeIndividualPermissionState(new(_groupFullInfoDto.Group, new(_apiController.UID), perm));
+            ImGui.CloseCurrentPopup();
+        }
+
+        if (IsModerator || IsOwner)
+        {
+            ImGui.Separator();
+            ImGui.TextUnformatted("Syncshell Admin Functions");
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Cog, "Open Admin Panel", menuWidth, true))
+            {
+                ImGui.CloseCurrentPopup();
+                _mareMediator.Publish(new OpenSyncshellAdminPanelPopupMessage(_groupFullInfoDto));
+            }
+        }
+    }
+
+    protected override void DrawName(float originalY, float width)
+    {
+        _idDisplayHandler.DrawGroupText(_id, _groupFullInfoDto, ImGui.GetCursorPosX(), originalY, () => width);
+    }
+
+    protected override float DrawRightSide(float originalY, float currentRightSideX)
+    {
+        var spacingX = ImGui.GetStyle().ItemSpacing.X;
+
+        FontAwesomeIcon pauseIcon = _groupFullInfoDto.GroupUserPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
+        var pauseButtonSize = UiSharedService.GetIconButtonSize(pauseIcon);
+
+        var folderIcon = FontAwesomeIcon.UsersCog;
+        var userCogButtonSize = UiSharedService.GetIconSize(folderIcon);
+
+        var individualSoundsDisabled = _groupFullInfoDto.GroupUserPermissions.IsDisableSounds();
+        var individualAnimDisabled = _groupFullInfoDto.GroupUserPermissions.IsDisableAnimations();
+        var individualVFXDisabled = _groupFullInfoDto.GroupUserPermissions.IsDisableVFX();
+
+        var infoIconPosDist = currentRightSideX - pauseButtonSize.X - spacingX;
+
+        ImGui.SameLine(infoIconPosDist - userCogButtonSize.X);
+
+        using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow,
+            _groupFullInfoDto.GroupPermissions.IsPreferDisableAnimations() != individualAnimDisabled
+            || _groupFullInfoDto.GroupPermissions.IsPreferDisableSounds() != individualSoundsDisabled
+            || _groupFullInfoDto.GroupPermissions.IsPreferDisableVFX() != individualVFXDisabled))
+            UiSharedService.FontText(folderIcon.ToIconString(), UiBuilder.IconFont);
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.BeginTooltip();
+
+            ImGui.TextUnformatted("Syncshell Permissions");
+            ImGui.Dummy(new(2f));
+
+            UiSharedService.BooleanToColoredIcon(!individualSoundsDisabled, inline: false);
+            ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
+            ImGui.TextUnformatted("Sound Sync");
+
+            UiSharedService.BooleanToColoredIcon(!individualAnimDisabled, inline: false);
+            ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
+            ImGui.TextUnformatted("Animation Sync");
+
+            UiSharedService.BooleanToColoredIcon(!individualVFXDisabled, inline: false);
+            ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
+            ImGui.TextUnformatted("VFX Sync");
+
+            ImGui.Separator();
+
+            ImGui.Dummy(new(2f));
+            ImGui.TextUnformatted("Suggested Permissions");
+            ImGui.Dummy(new(2f));
+
+            UiSharedService.BooleanToColoredIcon(!_groupFullInfoDto.GroupPermissions.IsPreferDisableSounds(), inline: false);
+            ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
+            ImGui.TextUnformatted("Sound Sync");
+
+            UiSharedService.BooleanToColoredIcon(!_groupFullInfoDto.GroupPermissions.IsPreferDisableAnimations(), inline: false);
+            ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
+            ImGui.TextUnformatted("Animation Sync");
+
+            UiSharedService.BooleanToColoredIcon(!_groupFullInfoDto.GroupPermissions.IsPreferDisableVFX(), inline: false);
+            ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
+            ImGui.TextUnformatted("VFX Sync");
+
+            ImGui.EndTooltip();
+        }
+
+        ImGui.SameLine();
+        if (ImGuiComponents.IconButton(pauseIcon))
+        {
+            var perm = _groupFullInfoDto.GroupUserPermissions;
+            perm.SetPaused(!perm.IsPaused());
+            _ = _apiController.GroupChangeIndividualPermissionState(new GroupPairUserPermissionDto(_groupFullInfoDto.Group, new(_apiController.UID), perm));
+        }
+        return currentRightSideX;
+    }
+}

MareSynchronos/UI/Components/DrawFolderTag.cs

@@ -0,0 +1,156 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Components;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.UI.Handlers;
+using MareSynchronos.WebAPI;
+
+namespace MareSynchronos.UI.Components;
+
+public class DrawFolderTag : DrawFolderBase
+{
+    private readonly ApiController _apiController;
+    private readonly SelectPairForTagUi _selectPairForTagUi;
+
+    public DrawFolderTag(string id, IEnumerable<DrawUserPair> drawPairs, TagHandler tagHandler, ApiController apiController, SelectPairForTagUi selectPairForTagUi)
+        : base(id, drawPairs, tagHandler)
+    {
+        _apiController = apiController;
+        _selectPairForTagUi = selectPairForTagUi;
+    }
+
+    protected override bool RenderIfEmpty => _id switch
+    {
+        TagHandler.CustomUnpairedTag => false,
+        TagHandler.CustomOnlineTag => false,
+        TagHandler.CustomOfflineTag => false,
+        TagHandler.CustomVisibleTag => false,
+        TagHandler.CustomAllTag => true,
+        _ => true,
+    };
+
+    protected override bool RenderMenu => _id switch
+    {
+        TagHandler.CustomUnpairedTag => false,
+        TagHandler.CustomOnlineTag => false,
+        TagHandler.CustomOfflineTag => false,
+        TagHandler.CustomVisibleTag => false,
+        TagHandler.CustomAllTag => false,
+        _ => true,
+    };
+
+    private bool RenderPause => _id switch
+    {
+        TagHandler.CustomUnpairedTag => false,
+        TagHandler.CustomOnlineTag => false,
+        TagHandler.CustomOfflineTag => false,
+        TagHandler.CustomVisibleTag => false,
+        TagHandler.CustomAllTag => false,
+        _ => true,
+    } && _drawPairs.Any();
+
+    protected override float DrawIcon(float textPosY, float originalY)
+    {
+        using var font = ImRaii.PushFont(UiBuilder.IconFont);
+        var icon = _id switch
+        {
+            TagHandler.CustomUnpairedTag => FontAwesomeIcon.ArrowsLeftRight.ToIconString(),
+            TagHandler.CustomOnlineTag => FontAwesomeIcon.Link.ToIconString(),
+            TagHandler.CustomOfflineTag => FontAwesomeIcon.Unlink.ToIconString(),
+            TagHandler.CustomVisibleTag => FontAwesomeIcon.Eye.ToIconString(),
+            TagHandler.CustomAllTag => FontAwesomeIcon.User.ToIconString(),
+            _ => FontAwesomeIcon.Folder.ToIconString()
+        };
+
+        ImGui.SetCursorPosY(textPosY);
+        ImGui.TextUnformatted(icon);
+        ImGui.SameLine();
+        return ImGui.GetCursorPosX();
+    }
+
+    protected override void DrawMenu(float menuWidth)
+    {
+        ImGui.TextUnformatted("Group Menu");
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.Users, "Select Pairs", menuWidth, true))
+        {
+            _selectPairForTagUi.Open(_id);
+        }
+        UiSharedService.AttachToolTip("Select Individual Pairs for this Pair Group");
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Pair Group", menuWidth, true) && UiSharedService.CtrlPressed())
+        {
+            _tagHandler.RemoveTag(_id);
+        }
+        UiSharedService.AttachToolTip("Hold CTRL to remove this Group permanently." + Environment.NewLine +
+            "Note: this will not unpair with users in this Group.");
+    }
+
+    protected override void DrawName(float originalY, float width)
+    {
+        ImGui.SetCursorPosY(originalY);
+        string name = _id switch
+        {
+            TagHandler.CustomUnpairedTag => "One-sided Individual Pairs",
+            TagHandler.CustomOnlineTag => "Online / Paused by you",
+            TagHandler.CustomOfflineTag => "Offline / Paused by other",
+            TagHandler.CustomVisibleTag => "Visible",
+            TagHandler.CustomAllTag => "Users",
+            _ => _id
+        };
+
+        ImGui.TextUnformatted(name);
+    }
+
+    protected override float DrawRightSide(float originalY, float currentRightSideX)
+    {
+        if (!RenderPause) return currentRightSideX;
+
+        var allArePaused = _drawPairs.All(pair => pair.UserPair!.OwnPermissions.IsPaused());
+        var pauseButton = allArePaused ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
+        var pauseButtonX = UiSharedService.GetIconButtonSize(pauseButton).X;
+
+        var buttonPauseOffset = currentRightSideX - pauseButtonX;
+        ImGui.SameLine(buttonPauseOffset);
+        if (ImGuiComponents.IconButton(pauseButton))
+        {
+            if (allArePaused)
+            {
+                ResumeAllPairs(_drawPairs);
+            }
+            else
+            {
+                PauseRemainingPairs(_drawPairs);
+            }
+        }
+        if (allArePaused)
+        {
+            UiSharedService.AttachToolTip($"Resume pairing with all pairs in {_id}");
+        }
+        else
+        {
+            UiSharedService.AttachToolTip($"Pause pairing with all pairs in {_id}");
+        }
+
+        return currentRightSideX;
+    }
+
+    private void PauseRemainingPairs(IEnumerable<DrawUserPair> availablePairs)
+    {
+        foreach (var pairToPause in availablePairs.Where(pair => !pair.UserPair!.OwnPermissions.IsPaused()))
+        {
+            var perm = pairToPause.UserPair!.OwnPermissions;
+            perm.SetPaused(paused: true);
+            _ = _apiController.UserSetPairPermissions(new(new(pairToPause.UID), perm));
+        }
+    }
+
+    private void ResumeAllPairs(IEnumerable<DrawUserPair> availablePairs)
+    {
+        foreach (var pairToPause in availablePairs)
+        {
+            var perm = pairToPause.UserPair!.OwnPermissions;
+            perm.SetPaused(paused: false);
+            _ = _apiController.UserSetPairPermissions(new(new(pairToPause.UID), perm));
+        }
+    }
+}

MareSynchronos/UI/Components/DrawGroupPair.cs

@@ -1,336 +0,0 @@
-using Dalamud.Interface.Colors;
-using Dalamud.Interface.Components;
-using Dalamud.Interface;
-using ImGuiNET;
-using MareSynchronos.PlayerData.Pairs;
-using MareSynchronos.API.Data.Extensions;
-using MareSynchronos.WebAPI;
-using MareSynchronos.API.Dto.User;
-using MareSynchronos.UI.Handlers;
-using MareSynchronos.API.Dto.Group;
-using MareSynchronos.API.Data.Enum;
-using Dalamud.Interface.Utility;
-
-namespace MareSynchronos.UI.Components;
-
-public class DrawGroupPair : DrawPairBase
-{
-    private static string _banReason = string.Empty;
-    private static bool _banUserPopupOpen;
-    private static bool _showModalBanUser;
-    private readonly GroupPairFullInfoDto _fullInfoDto;
-    private readonly GroupFullInfoDto _group;
-
-    public DrawGroupPair(string id, Pair entry, ApiController apiController, GroupFullInfoDto group, GroupPairFullInfoDto fullInfoDto, UidDisplayHandler handler) : base(id, entry, apiController, handler)
-    {
-        _group = group;
-        _fullInfoDto = fullInfoDto;
-    }
-
-    protected override void DrawLeftSide(float textPosY, float originalY)
-    {
-        var entryUID = _pair.UserData.AliasOrUID;
-        var entryIsMod = _fullInfoDto.GroupPairStatusInfo.IsModerator();
-        var entryIsOwner = string.Equals(_pair.UserData.UID, _group.OwnerUID, StringComparison.Ordinal);
-        var entryIsPinned = _fullInfoDto.GroupPairStatusInfo.IsPinned();
-        var presenceIcon = _pair.IsVisible ? FontAwesomeIcon.Eye : (_pair.IsOnline ? FontAwesomeIcon.Link : FontAwesomeIcon.Unlink);
-        var presenceColor = (_pair.IsOnline || _pair.IsVisible) ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed;
-        var presenceText = entryUID + " is offline";
-
-        ImGui.SetCursorPosY(textPosY);
-        if (_pair.IsPaused)
-        {
-            presenceIcon = FontAwesomeIcon.Question;
-            presenceColor = ImGuiColors.DalamudGrey;
-            presenceText = entryUID + " online status is unknown (paused)";
-
-            ImGui.PushFont(UiBuilder.IconFont);
-            UiSharedService.ColorText(FontAwesomeIcon.PauseCircle.ToIconString(), ImGuiColors.DalamudYellow);
-            ImGui.PopFont();
-
-            UiSharedService.AttachToolTip("Pairing status with " + entryUID + " is paused");
-        }
-        else
-        {
-            ImGui.PushFont(UiBuilder.IconFont);
-            UiSharedService.ColorText(FontAwesomeIcon.Check.ToIconString(), ImGuiColors.ParsedGreen);
-            ImGui.PopFont();
-
-            UiSharedService.AttachToolTip("You are paired with " + entryUID);
-        }
-
-        if (_pair.IsOnline && !_pair.IsVisible) presenceText = entryUID + " is online";
-        else if (_pair.IsOnline && _pair.IsVisible) presenceText = entryUID + " is visible: " + _pair.PlayerName;
-
-        ImGui.SameLine();
-        ImGui.SetCursorPosY(textPosY);
-        ImGui.PushFont(UiBuilder.IconFont);
-        UiSharedService.ColorText(presenceIcon.ToIconString(), presenceColor);
-        ImGui.PopFont();
-        UiSharedService.AttachToolTip(presenceText);
-
-        if (entryIsOwner)
-        {
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(textPosY);
-            ImGui.PushFont(UiBuilder.IconFont);
-            ImGui.TextUnformatted(FontAwesomeIcon.Crown.ToIconString());
-            ImGui.PopFont();
-            UiSharedService.AttachToolTip("User is owner of this Syncshell");
-        }
-        else if (entryIsMod)
-        {
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(textPosY);
-            ImGui.PushFont(UiBuilder.IconFont);
-            ImGui.TextUnformatted(FontAwesomeIcon.UserShield.ToIconString());
-            ImGui.PopFont();
-            UiSharedService.AttachToolTip("User is moderator of this Syncshell");
-        }
-        else if (entryIsPinned)
-        {
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(textPosY);
-            ImGui.PushFont(UiBuilder.IconFont);
-            ImGui.TextUnformatted(FontAwesomeIcon.Thumbtack.ToIconString());
-            ImGui.PopFont();
-            UiSharedService.AttachToolTip("User is pinned in this Syncshell");
-        }
-    }
-
-    protected override float DrawRightSide(float textPosY, float originalY)
-    {
-        var entryUID = _fullInfoDto.UserAliasOrUID;
-        var entryIsMod = _fullInfoDto.GroupPairStatusInfo.IsModerator();
-        var entryIsOwner = string.Equals(_pair.UserData.UID, _group.OwnerUID, StringComparison.Ordinal);
-        var entryIsPinned = _fullInfoDto.GroupPairStatusInfo.IsPinned();
-        var userIsOwner = string.Equals(_group.OwnerUID, _apiController.UID, StringComparison.OrdinalIgnoreCase);
-        var userIsModerator = _group.GroupUserInfo.IsModerator();
-
-        var soundsDisabled = _fullInfoDto.GroupUserPermissions.IsDisableSounds();
-        var animDisabled = _fullInfoDto.GroupUserPermissions.IsDisableAnimations();
-        var vfxDisabled = _fullInfoDto.GroupUserPermissions.IsDisableVFX();
-        var individualSoundsDisabled = (_pair.UserPair?.OwnPermissions.IsDisableSounds() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableSounds() ?? false);
-        var individualAnimDisabled = (_pair.UserPair?.OwnPermissions.IsDisableAnimations() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableAnimations() ?? false);
-        var individualVFXDisabled = (_pair.UserPair?.OwnPermissions.IsDisableVFX() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableVFX() ?? false);
-
-        bool showInfo = (individualAnimDisabled || individualSoundsDisabled || animDisabled || soundsDisabled);
-        bool showPlus = _pair.UserPair == null;
-        bool showBars = (userIsOwner || (userIsModerator && !entryIsMod && !entryIsOwner)) || !_pair.IsPaused;
-
-        var spacing = ImGui.GetStyle().ItemSpacing.X;
-        var permIcon = (individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled) ? FontAwesomeIcon.ExclamationTriangle
-            : ((soundsDisabled || animDisabled || vfxDisabled) ? FontAwesomeIcon.InfoCircle : FontAwesomeIcon.None);
-        var infoIconWidth = UiSharedService.GetIconSize(permIcon).X;
-        var plusButtonWidth = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Plus).X;
-        var barButtonWidth = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars).X;
-
-        var pos = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth() + spacing
-            - (showInfo ? (infoIconWidth + spacing) : 0)
-            - (showPlus ? (plusButtonWidth + spacing) : 0)
-            - (showBars ? (barButtonWidth + spacing) : 0);
-
-        ImGui.SameLine(pos);
-        if (individualAnimDisabled || individualSoundsDisabled)
-        {
-            ImGui.SetCursorPosY(textPosY);
-            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
-            UiSharedService.FontText(permIcon.ToIconString(), UiBuilder.IconFont);
-            ImGui.PopStyleColor();
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.BeginTooltip();
-
-                ImGui.Text("Individual User permissions");
-
-                if (individualSoundsDisabled)
-                {
-                    var userSoundsText = "Sound sync disabled with " + _pair.UserData.AliasOrUID;
-                    UiSharedService.FontText(FontAwesomeIcon.VolumeOff.ToIconString(), UiBuilder.IconFont);
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text(userSoundsText);
-                    ImGui.NewLine();
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text("You: " + (_pair.UserPair!.OwnPermissions.IsDisableSounds() ? "Disabled" : "Enabled") + ", They: " + (_pair.UserPair!.OtherPermissions.IsDisableSounds() ? "Disabled" : "Enabled"));
-                }
-
-                if (individualAnimDisabled)
-                {
-                    var userAnimText = "Animation sync disabled with " + _pair.UserData.AliasOrUID;
-                    UiSharedService.FontText(FontAwesomeIcon.Stop.ToIconString(), UiBuilder.IconFont);
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text(userAnimText);
-                    ImGui.NewLine();
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text("You: " + (_pair.UserPair!.OwnPermissions.IsDisableAnimations() ? "Disabled" : "Enabled") + ", They: " + (_pair.UserPair!.OtherPermissions.IsDisableAnimations() ? "Disabled" : "Enabled"));
-                }
-
-                if (individualVFXDisabled)
-                {
-                    var userVFXText = "VFX sync disabled with " + _pair.UserData.AliasOrUID;
-                    UiSharedService.FontText(FontAwesomeIcon.Circle.ToIconString(), UiBuilder.IconFont);
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text(userVFXText);
-                    ImGui.NewLine();
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text("You: " + (_pair.UserPair!.OwnPermissions.IsDisableVFX() ? "Disabled" : "Enabled") + ", They: " + (_pair.UserPair!.OtherPermissions.IsDisableVFX() ? "Disabled" : "Enabled"));
-                }
-
-                ImGui.EndTooltip();
-            }
-            ImGui.SameLine();
-        }
-        else if ((animDisabled || soundsDisabled))
-        {
-            ImGui.SetCursorPosY(textPosY);
-            UiSharedService.FontText(permIcon.ToIconString(), UiBuilder.IconFont);
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.BeginTooltip();
-
-                ImGui.Text("Sycnshell User permissions");
-
-                if (soundsDisabled)
-                {
-                    var userSoundsText = "Sound sync disabled by " + _pair.UserData.AliasOrUID;
-                    UiSharedService.FontText(FontAwesomeIcon.VolumeOff.ToIconString(), UiBuilder.IconFont);
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text(userSoundsText);
-                }
-
-                if (animDisabled)
-                {
-                    var userAnimText = "Animation sync disabled by " + _pair.UserData.AliasOrUID;
-                    UiSharedService.FontText(FontAwesomeIcon.Stop.ToIconString(), UiBuilder.IconFont);
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text(userAnimText);
-                }
-
-                if (vfxDisabled)
-                {
-                    var userVFXText = "VFX sync disabled by " + _pair.UserData.AliasOrUID;
-                    UiSharedService.FontText(FontAwesomeIcon.Circle.ToIconString(), UiBuilder.IconFont);
-                    ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                    ImGui.Text(userVFXText);
-                }
-
-                ImGui.EndTooltip();
-            }
-            ImGui.SameLine();
-        }
-
-        if (showPlus)
-        {
-            ImGui.SetCursorPosY(originalY);
-
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
-            {
-                _ = _apiController.UserAddPair(new UserDto(new(_pair.UserData.UID)));
-            }
-            UiSharedService.AttachToolTip("Pair with " + entryUID + " individually");
-            ImGui.SameLine();
-        }
-
-        if (showBars)
-        {
-            ImGui.SetCursorPosY(originalY);
-
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Bars))
-            {
-                ImGui.OpenPopup("Popup");
-            }
-        }
-
-        if (ImGui.BeginPopup("Popup"))
-        {
-            if ((userIsModerator || userIsOwner) && !(entryIsMod || entryIsOwner))
-            {
-                var pinText = entryIsPinned ? "Unpin user" : "Pin user";
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.Thumbtack, pinText))
-                {
-                    ImGui.CloseCurrentPopup();
-                    var userInfo = _fullInfoDto.GroupPairStatusInfo ^ GroupUserInfo.IsPinned;
-                    _ = _apiController.GroupSetUserInfo(new GroupPairUserInfoDto(_fullInfoDto.Group, _fullInfoDto.User, userInfo));
-                }
-                UiSharedService.AttachToolTip("Pin this user to the Syncshell. Pinned users will not be deleted in case of a manually initiated Syncshell clean");
-
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Remove user") && UiSharedService.CtrlPressed())
-                {
-                    ImGui.CloseCurrentPopup();
-                    _ = _apiController.GroupRemoveUser(_fullInfoDto);
-                }
-
-                UiSharedService.AttachToolTip("Hold CTRL and click to remove user " + (_pair.UserData.AliasOrUID) + " from Syncshell");
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.UserSlash, "Ban User"))
-                {
-                    _showModalBanUser = true;
-                    ImGui.CloseCurrentPopup();
-                }
-                UiSharedService.AttachToolTip("Ban user from this Syncshell");
-            }
-
-            if (userIsOwner)
-            {
-                string modText = entryIsMod ? "Demod user" : "Mod user";
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.UserShield, modText) && UiSharedService.CtrlPressed())
-                {
-                    ImGui.CloseCurrentPopup();
-                    var userInfo = _fullInfoDto.GroupPairStatusInfo ^ GroupUserInfo.IsModerator;
-                    _ = _apiController.GroupSetUserInfo(new GroupPairUserInfoDto(_fullInfoDto.Group, _fullInfoDto.User, userInfo));
-                }
-                UiSharedService.AttachToolTip("Hold CTRL to change the moderator status for " + (_fullInfoDto.UserAliasOrUID) + Environment.NewLine +
-                    "Moderators can kick, ban/unban, pin/unpin users and clear the Syncshell.");
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.Crown, "Transfer Ownership") && UiSharedService.CtrlPressed() && UiSharedService.ShiftPressed())
-                {
-                    ImGui.CloseCurrentPopup();
-                    _ = _apiController.GroupChangeOwnership(_fullInfoDto);
-                }
-                UiSharedService.AttachToolTip("Hold CTRL and SHIFT and click to transfer ownership of this Syncshell to " + (_fullInfoDto.UserAliasOrUID) + Environment.NewLine + "WARNING: This action is irreversible.");
-            }
-
-            ImGui.Separator();
-            if (!_pair.IsPaused)
-            {
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.User, "Open Profile"))
-                {
-                    _displayHandler.OpenProfile(_pair);
-                    ImGui.CloseCurrentPopup();
-                }
-                UiSharedService.AttachToolTip("Opens the profile for this user in a new window");
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.ExclamationTriangle, "Report Mare Profile"))
-                {
-                    ImGui.CloseCurrentPopup();
-                    _showModalReport = true;
-                }
-                UiSharedService.AttachToolTip("Report this users Mare Profile to the administrative team");
-            }
-            ImGui.EndPopup();
-        }
-
-        if (_showModalBanUser && !_banUserPopupOpen)
-        {
-            ImGui.OpenPopup("Ban User");
-            _banUserPopupOpen = true;
-        }
-
-        if (!_showModalBanUser) _banUserPopupOpen = false;
-
-        if (ImGui.BeginPopupModal("Ban User", ref _showModalBanUser, UiSharedService.PopupWindowFlags))
-        {
-            UiSharedService.TextWrapped("User " + (_fullInfoDto.UserAliasOrUID) + " will be banned and removed from this Syncshell.");
-            ImGui.InputTextWithHint("##banreason", "Ban Reason", ref _banReason, 255);
-            if (ImGui.Button("Ban User"))
-            {
-                ImGui.CloseCurrentPopup();
-                var reason = _banReason;
-                _ = _apiController.GroupBanUser(new GroupPairDto(_group.Group, _fullInfoDto.User), reason);
-                _banReason = string.Empty;
-            }
-            UiSharedService.TextWrapped("The reason will be displayed in the banlist. The current server-side alias if present (Vanity ID) will automatically be attached to the reason.");
-            UiSharedService.SetScaledWindowSize(300);
-            ImGui.EndPopup();
-        }
-
-        return pos - spacing;
-    }
-}

MareSynchronos/UI/Components/DrawGroupedGroupFolder.cs

@@ -0,0 +1,49 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.UI.Handlers;
+
+namespace MareSynchronos.UI.Components;
+
+public class DrawGroupedGroupFolder : IDrawFolder
+{
+    private readonly IEnumerable<IDrawFolder> _groups;
+    private readonly TagHandler _tagHandler;
+
+    public DrawGroupedGroupFolder(IEnumerable<IDrawFolder> groups, TagHandler tagHandler)
+    {
+        _groups = groups;
+        _tagHandler = tagHandler;
+    }
+
+    public void Draw()
+    {
+        if (!_groups.Any()) return;
+
+        string _id = "__folder_syncshells";
+        using var id = ImRaii.PushId(_id);
+
+        var icon = _tagHandler.IsTagOpen(_id) ? FontAwesomeIcon.CaretDown : FontAwesomeIcon.CaretRight;
+        UiSharedService.FontText(icon.ToIconString(), UiBuilder.IconFont);
+        if (ImGui.IsItemClicked())
+        {
+            _tagHandler.SetTagOpen(_id, !_tagHandler.IsTagOpen(_id));
+        }
+
+        ImGui.SameLine();
+        using (ImRaii.PushFont(UiBuilder.IconFont))
+            ImGui.TextUnformatted(FontAwesomeIcon.UsersRectangle.ToIconString());
+        ImGui.SameLine();
+        ImGui.TextUnformatted("All Syncshells");
+        ImGui.Separator();
+
+        if (_tagHandler.IsTagOpen(_id))
+        {
+            using var indent = ImRaii.PushIndent(20f);
+            foreach (var entry in _groups)
+            {
+                entry.Draw();
+            }
+        }
+    }
+}

MareSynchronos/UI/Components/DrawPairBase.cs

@@ -1,84 +0,0 @@
-using Dalamud.Interface;
-using Dalamud.Interface.Colors;
-using ImGuiNET;
-using MareSynchronos.PlayerData.Pairs;
-using MareSynchronos.UI.Handlers;
-using MareSynchronos.WebAPI;
-
-namespace MareSynchronos.UI.Components;
-
-public abstract class DrawPairBase
-{
-    protected static bool _showModalReport = false;
-    protected readonly ApiController _apiController;
-    protected readonly UidDisplayHandler _displayHandler;
-    protected Pair _pair;
-    private static bool _reportPopupOpen = false;
-    private static string _reportReason = string.Empty;
-    private readonly string _id;
-
-    protected DrawPairBase(string id, Pair entry, ApiController apiController, UidDisplayHandler uIDDisplayHandler)
-    {
-        _id = id;
-        _pair = entry;
-        _apiController = apiController;
-        _displayHandler = uIDDisplayHandler;
-    }
-
-    public string UID => _pair.UserData.UID;
-
-    public void DrawPairedClient()
-    {
-        var originalY = ImGui.GetCursorPosY();
-        var pauseIconSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Play);
-        var textSize = ImGui.CalcTextSize(_pair.UserData.AliasOrUID);
-
-        var textPosY = originalY + pauseIconSize.Y / 2 - textSize.Y / 2;
-        DrawLeftSide(textPosY, originalY);
-        ImGui.SameLine();
-        var posX = ImGui.GetCursorPosX();
-        var rightSide = DrawRightSide(textPosY, originalY);
-        DrawName(originalY, posX, rightSide);
-
-        if (_showModalReport && !_reportPopupOpen)
-        {
-            ImGui.OpenPopup("Report Profile");
-            _reportPopupOpen = true;
-        }
-
-        if (!_showModalReport) _reportPopupOpen = false;
-
-        if (ImGui.BeginPopupModal("Report Profile", ref _showModalReport, UiSharedService.PopupWindowFlags))
-        {
-            UiSharedService.TextWrapped("Report " + (_pair.UserData.AliasOrUID) + " Mare Profile");
-            ImGui.InputTextMultiline("##reportReason", ref _reportReason, 500, new System.Numerics.Vector2(500 - ImGui.GetStyle().ItemSpacing.X * 2, 200));
-            UiSharedService.TextWrapped($"Note: Sending a report will disable the offending profile globally.{Environment.NewLine}" +
-                $"The report will be sent to the team of your currently connected Mare Synchronos Service.{Environment.NewLine}" +
-                $"The report will include your user and your contact info (Discord User).{Environment.NewLine}" +
-                $"Depending on the severity of the offense the users Mare profile or account can be permanently disabled or banned.");
-            UiSharedService.ColorTextWrapped("Report spam and wrong reports will not be tolerated and can lead to permanent account suspension.", ImGuiColors.DalamudRed);
-            if (string.IsNullOrEmpty(_reportReason)) ImGui.BeginDisabled();
-            if (ImGui.Button("Send Report"))
-            {
-                ImGui.CloseCurrentPopup();
-                var reason = _reportReason;
-                _ = _apiController.UserReportProfile(new(_pair.UserData, reason));
-                _reportReason = string.Empty;
-                _showModalReport = false;
-                _reportPopupOpen = false;
-            }
-            if (string.IsNullOrEmpty(_reportReason)) ImGui.EndDisabled();
-            UiSharedService.SetScaledWindowSize(500);
-            ImGui.EndPopup();
-        }
-    }
-
-    protected abstract void DrawLeftSide(float textPosY, float originalY);
-
-    protected abstract float DrawRightSide(float textPosY, float originalY);
-
-    private void DrawName(float originalY, float leftSide, float rightSide)
-    {
-        _displayHandler.DrawPairText(_id, _pair, leftSide, originalY, () => rightSide - leftSide);
-    }
-}

MareSynchronos/UI/Components/DrawUserPair.cs

@@ -1,73 +1,298 @@
-using Dalamud.Interface.Colors;
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
-using Dalamud.Interface;
-using ImGuiNET;
-using MareSynchronos.PlayerData.Pairs;
-using System.Numerics;
-using MareSynchronos.API.Data.Extensions;
-using MareSynchronos.WebAPI;
-using MareSynchronos.API.Dto.User;
-using MareSynchronos.UI.Handlers;
 using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.API.Dto.User;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.Services.ServerConfiguration;
+using MareSynchronos.UI.Handlers;
+using MareSynchronos.WebAPI;
 
 namespace MareSynchronos.UI.Components;
 
-public class DrawUserPair : DrawPairBase
+public class DrawUserPair
 {
-    private readonly SelectGroupForPairUi _selectGroupForPairUi;
+    protected readonly ApiController _apiController;
+    protected readonly IdDisplayHandler _displayHandler;
+    protected readonly MareMediator _mediator;
+    protected readonly List<GroupFullInfoDto> _syncedGroups;
+    protected Pair _pair;
+    private readonly string _id;
+    private readonly SelectTagForPairUi _selectTagForPairUi;
+    private readonly ServerConfigurationManager _serverConfigurationManager;
+    private float _menuRenderWidth = -1;
 
-    public DrawUserPair(string id, Pair entry, UidDisplayHandler displayHandler, ApiController apiController, SelectGroupForPairUi selectGroupForPairUi) : base(id, entry, apiController, displayHandler)
+    public DrawUserPair(string id, Pair entry, List<GroupFullInfoDto> syncedGroups,
+        ApiController apiController, IdDisplayHandler uIDDisplayHandler,
+        MareMediator mareMediator, SelectTagForPairUi selectTagForPairUi,
+        ServerConfigurationManager serverConfigurationManager)
     {
-        if (_pair.UserPair == null) throw new ArgumentException("Pair must be UserPair", nameof(entry));
+        _id = id;
         _pair = entry;
-        _selectGroupForPairUi = selectGroupForPairUi;
+        _syncedGroups = syncedGroups;
+        _apiController = apiController;
+        _displayHandler = uIDDisplayHandler;
+        _mediator = mareMediator;
+        _selectTagForPairUi = selectTagForPairUi;
+        _serverConfigurationManager = serverConfigurationManager;
     }
 
-    public bool IsOnline => _pair.IsOnline;
+    public Pair Pair => _pair;
-    public bool IsVisible => _pair.IsVisible;
+    public string UID => _pair.UserData.UID;
-    public UserPairDto UserPair => _pair.UserPair!;
+    public UserFullPairDto UserPair => _pair.UserPair!;
 
-    protected override void DrawLeftSide(float textPosY, float originalY)
+    public void DrawPairedClient()
     {
-        FontAwesomeIcon connectionIcon;
+        using var id = ImRaii.PushId(GetType() + _id);
-        Vector4 connectionColor;
+        var originalY = ImGui.GetCursorPosY();
-        string connectionText;
+        var pauseIconSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars);
-        if (!(_pair.UserPair!.OwnPermissions.IsPaired() && _pair.UserPair!.OtherPermissions.IsPaired()))
+        var textSize = ImGui.CalcTextSize(_pair.UserData.AliasOrUID);
+
+        var textPosY = originalY + pauseIconSize.Y / 2 - textSize.Y / 2;
+        DrawLeftSide(textPosY);
+        ImGui.SameLine();
+        var posX = ImGui.GetCursorPosX();
+        var rightSide = DrawRightSide(originalY);
+        DrawName(originalY, posX, rightSide);
+    }
+
+    private void DrawCommonClientMenu()
+    {
+        if (!_pair.IsPaused)
         {
-            connectionIcon = FontAwesomeIcon.ArrowUp;
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.User, "Open Profile", _menuRenderWidth, true))
-            connectionText = _pair.UserData.AliasOrUID + " has not added you back";
+            {
-            connectionColor = ImGuiColors.DalamudRed;
+                _displayHandler.OpenProfile(_pair);
+                ImGui.CloseCurrentPopup();
+            }
+            UiSharedService.AttachToolTip("Opens the profile for this user in a new window");
         }
-        else if (_pair.UserPair!.OwnPermissions.IsPaused() || _pair.UserPair!.OtherPermissions.IsPaused())
+        if (_pair.IsVisible)
         {
-            connectionIcon = FontAwesomeIcon.PauseCircle;
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Sync, "Reload last data", _menuRenderWidth, true))
-            connectionText = "Pairing status with " + _pair.UserData.AliasOrUID + " is paused";
+            {
-            connectionColor = ImGuiColors.DalamudYellow;
+                _pair.ApplyLastReceivedData(forced: true);
+                ImGui.CloseCurrentPopup();
+            }
+            UiSharedService.AttachToolTip("This reapplies the last received character data to this character");
+        }
+
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Cycle pause state", _menuRenderWidth, true))
+        {
+            _ = _apiController.CyclePause(_pair.UserData);
+            ImGui.CloseCurrentPopup();
+        }
+        ImGui.Separator();
+
+        ImGui.TextUnformatted("Pair Permission Functions");
+        var isSticky = _pair.UserPair!.OwnPermissions.IsSticky();
+        string stickyText = isSticky ? "Disable Preferred Permissions" : "Enable Preferred Permissions";
+        var stickyIcon = isSticky ? FontAwesomeIcon.ArrowCircleDown : FontAwesomeIcon.ArrowCircleUp;
+        if (UiSharedService.IconTextButton(stickyIcon, stickyText, _menuRenderWidth, true))
+        {
+            var permissions = _pair.UserPair.OwnPermissions;
+            permissions.SetSticky(!isSticky);
+            _ = _apiController.UserSetPairPermissions(new(_pair.UserData, permissions));
+        }
+        UiSharedService.AttachToolTip("Preferred permissions means that this pair will not" + Environment.NewLine + " be affected by any syncshell permission changes through you.");
+
+        string individualText = Environment.NewLine + Environment.NewLine + "Note: changing this permission will turn the permissions for this"
+            + Environment.NewLine + "user to preferred permissions. You can change this behavior"
+            + Environment.NewLine + "in the permission settings.";
+        bool individual = !_pair.IsDirectlyPaired && _apiController.DefaultPermissions!.IndividualIsSticky;
+
+        var isDisableSounds = _pair.UserPair!.OwnPermissions.IsDisableSounds();
+        string disableSoundsText = isDisableSounds ? "Enable sound sync" : "Disable sound sync";
+        var disableSoundsIcon = isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute;
+        if (UiSharedService.IconTextButton(disableSoundsIcon, disableSoundsText, _menuRenderWidth, true))
+        {
+            var permissions = _pair.UserPair.OwnPermissions;
+            permissions.SetDisableSounds(!isDisableSounds);
+            _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(_pair.UserData, permissions));
+        }
+        UiSharedService.AttachToolTip("Changes sound sync permissions with this user." + (individual ? individualText : string.Empty));
+
+        var isDisableAnims = _pair.UserPair!.OwnPermissions.IsDisableAnimations();
+        string disableAnimsText = isDisableAnims ? "Enable animation sync" : "Disable animation sync";
+        var disableAnimsIcon = isDisableAnims ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop;
+        if (UiSharedService.IconTextButton(disableAnimsIcon, disableAnimsText, _menuRenderWidth, true))
+        {
+            var permissions = _pair.UserPair.OwnPermissions;
+            permissions.SetDisableAnimations(!isDisableAnims);
+            _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(_pair.UserData, permissions));
+        }
+        UiSharedService.AttachToolTip("Changes animation sync permissions with this user." + (individual ? individualText : string.Empty));
+
+        var isDisableVFX = _pair.UserPair!.OwnPermissions.IsDisableVFX();
+        string disableVFXText = isDisableVFX ? "Enable VFX sync" : "Disable VFX sync";
+        var disableVFXIcon = isDisableVFX ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle;
+        if (UiSharedService.IconTextButton(disableVFXIcon, disableVFXText, _menuRenderWidth, true))
+        {
+            var permissions = _pair.UserPair.OwnPermissions;
+            permissions.SetDisableVFX(!isDisableVFX);
+            _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(_pair.UserData, permissions));
+        }
+        UiSharedService.AttachToolTip("Changes VFX sync permissions with this user." + (individual ? individualText : string.Empty));
+
+        if (!_pair.IsPaused)
+        {
+            ImGui.Separator();
+            ImGui.TextUnformatted("Pair reporting");
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.ExclamationTriangle, "Report Mare Profile", _menuRenderWidth, true))
+            {
+                ImGui.CloseCurrentPopup();
+                _mediator.Publish(new OpenReportPopupMessage(_pair));
+            }
+            UiSharedService.AttachToolTip("Report this users Mare Profile to the administrative team.");
+        }
+    }
+
+    private void DrawIndividualMenu()
+    {
+        ImGui.TextUnformatted("Individual Pair Functions");
+        var entryUID = _pair.UserData.AliasOrUID;
+
+        if (_pair.IndividualPairStatus != API.Data.Enum.IndividualPairStatus.None)
+        {
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Folder, "Pair Groups", _menuRenderWidth, true))
+            {
+                _selectTagForPairUi.Open(_pair);
+            }
+            UiSharedService.AttachToolTip("Choose pair groups for " + entryUID);
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Unpair Permanently", _menuRenderWidth, true) && UiSharedService.CtrlPressed())
+            {
+                _ = _apiController.UserRemovePair(new(_pair.UserData));
+            }
+            UiSharedService.AttachToolTip("Hold CTRL and click to unpair permanently from " + entryUID);
         }
         else
         {
-            connectionIcon = FontAwesomeIcon.Check;
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Plus, "Pair individually", _menuRenderWidth, true))
-            connectionText = "You are paired with " + _pair.UserData.AliasOrUID;
+            {
-            connectionColor = ImGuiColors.ParsedGreen;
+                _ = _apiController.UserAddPair(new(_pair.UserData));
-        }
+            }
-
+            UiSharedService.AttachToolTip("Pair individually with " + entryUID);
-        ImGui.SetCursorPosY(textPosY);
-        ImGui.PushFont(UiBuilder.IconFont);
-        UiSharedService.ColorText(connectionIcon.ToIconString(), connectionColor);
-        ImGui.PopFont();
-        UiSharedService.AttachToolTip(connectionText);
-        if (_pair is { IsOnline: true, IsVisible: true })
-        {
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(textPosY);
-            ImGui.PushFont(UiBuilder.IconFont);
-            UiSharedService.ColorText(FontAwesomeIcon.Eye.ToIconString(), ImGuiColors.ParsedGreen);
-            ImGui.PopFont();
-            UiSharedService.AttachToolTip(_pair.UserData.AliasOrUID + " is visible: " + _pair.PlayerName!);
         }
     }
 
-    protected override float DrawRightSide(float textPosY, float originalY)
+    private void DrawLeftSide(float textPosY)
+    {
+        string userPairText = string.Empty;
+
+        ImGui.SetCursorPosY(textPosY);
+
+        if (_pair.IsPaused)
+        {
+            ImGui.SetCursorPosY(textPosY);
+            using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
+            using var font = ImRaii.PushFont(UiBuilder.IconFont);
+            ImGui.TextUnformatted(FontAwesomeIcon.PauseCircle.ToIconString());
+            userPairText = _pair.UserData.AliasOrUID + " is paused";
+        }
+        else if (!_pair.IsOnline)
+        {
+            ImGui.SetCursorPosY(textPosY);
+            using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            using var font = ImRaii.PushFont(UiBuilder.IconFont);
+            ImGui.TextUnformatted(_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.Bidirectional
+                ? FontAwesomeIcon.User.ToIconString() : FontAwesomeIcon.Users.ToIconString());
+            userPairText = _pair.UserData.AliasOrUID + " is offline";
+        }
+        else
+        {
+            using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.ParsedGreen);
+            using var font = ImRaii.PushFont(UiBuilder.IconFont);
+            ImGui.TextUnformatted(_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.Bidirectional
+                ? FontAwesomeIcon.User.ToIconString() : FontAwesomeIcon.Users.ToIconString());
+            userPairText = _pair.UserData.AliasOrUID + " is online";
+        }
+
+        if (_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.OneSided)
+        {
+            userPairText += UiSharedService.TooltipSeparator + "User has not added you back";
+        }
+        else if (_pair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.Bidirectional)
+        {
+            userPairText += UiSharedService.TooltipSeparator + "You are directly Paired";
+        }
+
+        if (_syncedGroups.Any())
+        {
+            userPairText += UiSharedService.TooltipSeparator + string.Join(Environment.NewLine,
+                _syncedGroups.Select(g =>
+                {
+                    var groupNote = _serverConfigurationManager.GetNoteForGid(g.GID);
+                    var groupString = string.IsNullOrEmpty(groupNote) ? g.GroupAliasOrGID : $"{groupNote} ({g.GroupAliasOrGID})";
+                    return "Paired through " + groupString;
+                }));
+        }
+        UiSharedService.AttachToolTip(userPairText);
+
+        if (_pair.UserPair.OwnPermissions.IsSticky())
+        {
+            ImGui.SetCursorPosY(textPosY);
+
+            using (ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, ImGui.GetStyle().ItemSpacing with { X = ImGui.GetStyle().ItemSpacing.X * 3 / 4f }))
+            using (ImRaii.PushFont(UiBuilder.IconFont))
+            {
+                ImGui.SameLine();
+                ImGui.TextUnformatted(FontAwesomeIcon.ArrowCircleUp.ToIconString());
+            }
+
+            UiSharedService.AttachToolTip(_pair.UserData.AliasOrUID + " has preferred permissions enabled");
+        }
+
+        if (_pair.IsVisible)
+        {
+            ImGui.SetCursorPosY(textPosY);
+            using (ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, ImGui.GetStyle().ItemSpacing with { X = ImGui.GetStyle().ItemSpacing.X * 3 / 4f }))
+            using (ImRaii.PushFont(UiBuilder.IconFont))
+            {
+                ImGui.SameLine();
+                using var _ = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.ParsedGreen);
+                ImGui.TextUnformatted(FontAwesomeIcon.Eye.ToIconString());
+            }
+
+            UiSharedService.AttachToolTip("User is visible: " + _pair.PlayerName);
+        }
+    }
+
+    private void DrawName(float originalY, float leftSide, float rightSide)
+    {
+        _displayHandler.DrawPairText(_id, _pair, leftSide, originalY, () => rightSide - leftSide);
+    }
+
+    private void DrawPairedClientMenu()
+    {
+        DrawIndividualMenu();
+
+        if (_syncedGroups.Any()) ImGui.Separator();
+        foreach (var entry in _syncedGroups)
+        {
+            bool selfIsOwner = string.Equals(_apiController.UID, entry.Owner.UID, StringComparison.Ordinal);
+            bool selfIsModerator = entry.GroupUserInfo.IsModerator();
+            bool userIsModerator = entry.GroupPairUserInfos.TryGetValue(_pair.UserData.UID, out var modinfo) && modinfo.IsModerator();
+            bool userIsPinned = entry.GroupPairUserInfos.TryGetValue(_pair.UserData.UID, out var info) && info.IsPinned();
+            if (selfIsOwner || selfIsModerator)
+            {
+                var groupNote = _serverConfigurationManager.GetNoteForGid(entry.GID);
+                var groupString = string.IsNullOrEmpty(groupNote) ? entry.GroupAliasOrGID : $"{groupNote} ({entry.GroupAliasOrGID})";
+
+                if (ImGui.BeginMenu(groupString + " Moderation Functions"))
+                {
+                    DrawSyncshellMenu(entry, selfIsOwner, selfIsModerator, userIsPinned, userIsModerator);
+                    ImGui.EndMenu();
+                }
+            }
+        }
+    }
+
+    private float DrawRightSide(float originalY)
     {
         var pauseIcon = _pair.UserPair!.OwnPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
         var pauseIconSize = UiSharedService.GetIconButtonSize(pauseIcon);
@@ -76,8 +301,9 @@ public class DrawUserPair : DrawPairBase
         var spacingX = ImGui.GetStyle().ItemSpacing.X;
         var windowEndX = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth();
         var rightSideStart = 0f;
+        float infoIconDist = 0f;
 
-        if (_pair.UserPair!.OwnPermissions.IsPaired() && _pair.UserPair!.OtherPermissions.IsPaired())
+        if (_pair.IsPaired)
         {
             var individualSoundsDisabled = (_pair.UserPair?.OwnPermissions.IsDisableSounds() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableSounds() ?? false);
             var individualAnimDisabled = (_pair.UserPair?.OwnPermissions.IsDisableAnimations() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableAnimations() ?? false);
@@ -86,75 +312,83 @@ public class DrawUserPair : DrawPairBase
             if (individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled)
             {
                 var infoIconPosDist = windowEndX - barButtonSize.X - spacingX - pauseIconSize.X - spacingX;
-                var icon = FontAwesomeIcon.ExclamationTriangle;
+                var icon = FontAwesomeIcon.InfoCircle;
                 var iconwidth = UiSharedService.GetIconSize(icon);
 
-                rightSideStart = infoIconPosDist - iconwidth.X;
+                infoIconDist = iconwidth.X;
                 ImGui.SameLine(infoIconPosDist - iconwidth.X);
 
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
                 UiSharedService.FontText(icon.ToIconString(), UiBuilder.IconFont);
-                ImGui.PopStyleColor();
                 if (ImGui.IsItemHovered())
                 {
                     ImGui.BeginTooltip();
 
-                    ImGui.Text("Individual User permissions");
+                    ImGui.TextUnformatted("Individual User permissions");
+                    ImGui.Separator();
 
                     if (individualSoundsDisabled)
                     {
-                        var userSoundsText = "Sound sync disabled with " + _pair.UserData.AliasOrUID;
+                        var userSoundsText = "Sound sync";
                         UiSharedService.FontText(FontAwesomeIcon.VolumeOff.ToIconString(), UiBuilder.IconFont);
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(userSoundsText);
+                        ImGui.TextUnformatted(userSoundsText);
                         ImGui.NewLine();
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text("You: " + (_pair.UserPair!.OwnPermissions.IsDisableSounds() ? "Disabled" : "Enabled") + ", They: " + (_pair.UserPair!.OtherPermissions.IsDisableSounds() ? "Disabled" : "Enabled"));
+                        ImGui.TextUnformatted("You");
+                        UiSharedService.BooleanToColoredIcon(!_pair.UserPair!.OwnPermissions.IsDisableSounds());
+                        ImGui.SameLine();
+                        ImGui.TextUnformatted("They");
+                        UiSharedService.BooleanToColoredIcon(!_pair.UserPair!.OtherPermissions.IsDisableSounds());
                     }
 
                     if (individualAnimDisabled)
                     {
-                        var userAnimText = "Animation sync disabled with " + _pair.UserData.AliasOrUID;
+                        var userAnimText = "Animation sync";
                         UiSharedService.FontText(FontAwesomeIcon.Stop.ToIconString(), UiBuilder.IconFont);
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(userAnimText);
+                        ImGui.TextUnformatted(userAnimText);
                         ImGui.NewLine();
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text("You: " + (_pair.UserPair!.OwnPermissions.IsDisableAnimations() ? "Disabled" : "Enabled") + ", They: " + (_pair.UserPair!.OtherPermissions.IsDisableAnimations() ? "Disabled" : "Enabled"));
+                        ImGui.TextUnformatted("You");
+                        UiSharedService.BooleanToColoredIcon(!_pair.UserPair!.OwnPermissions.IsDisableAnimations());
+                        ImGui.SameLine();
+                        ImGui.TextUnformatted("They");
+                        UiSharedService.BooleanToColoredIcon(!_pair.UserPair!.OtherPermissions.IsDisableAnimations());
                     }
 
                     if (individualVFXDisabled)
                     {
-                        var userVFXText = "VFX sync disabled with " + _pair.UserData.AliasOrUID;
+                        var userVFXText = "VFX sync";
                         UiSharedService.FontText(FontAwesomeIcon.Circle.ToIconString(), UiBuilder.IconFont);
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(userVFXText);
+                        ImGui.TextUnformatted(userVFXText);
                         ImGui.NewLine();
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text("You: " + (_pair.UserPair!.OwnPermissions.IsDisableVFX() ? "Disabled" : "Enabled") + ", They: " + (_pair.UserPair!.OtherPermissions.IsDisableVFX() ? "Disabled" : "Enabled"));
+                        ImGui.TextUnformatted("You");
+                        UiSharedService.BooleanToColoredIcon(!_pair.UserPair!.OwnPermissions.IsDisableVFX());
+                        ImGui.SameLine();
+                        ImGui.TextUnformatted("They");
+                        UiSharedService.BooleanToColoredIcon(!_pair.UserPair!.OtherPermissions.IsDisableVFX());
                     }
 
                     ImGui.EndTooltip();
                 }
             }
-
-            if (rightSideStart == 0f)
-            {
-                rightSideStart = windowEndX - barButtonSize.X - spacingX * 2 - pauseIconSize.X;
-            }
-            ImGui.SameLine(windowEndX - barButtonSize.X - spacingX - pauseIconSize.X);
-            ImGui.SetCursorPosY(originalY);
-            if (ImGuiComponents.IconButton(pauseIcon))
-            {
-                var perm = _pair.UserPair!.OwnPermissions;
-                perm.SetPaused(!perm.IsPaused());
-                _ = _apiController.UserSetPairPermissions(new(_pair.UserData, perm));
-            }
-            UiSharedService.AttachToolTip(!_pair.UserPair!.OwnPermissions.IsPaused()
-                ? "Pause pairing with " + entryUID
-                : "Resume pairing with " + entryUID);
         }
 
+        rightSideStart = windowEndX - barButtonSize.X - spacingX * 3 - pauseIconSize.X - infoIconDist;
+        ImGui.SameLine(windowEndX - barButtonSize.X - spacingX - pauseIconSize.X);
+        ImGui.SetCursorPosY(originalY);
+        if (ImGuiComponents.IconButton(pauseIcon))
+        {
+            var perm = _pair.UserPair!.OwnPermissions;
+            perm.SetPaused(!perm.IsPaused());
+            _ = _apiController.UserSetPairPermissions(new(_pair.UserData, perm));
+        }
+        UiSharedService.AttachToolTip(!_pair.UserPair!.OwnPermissions.IsPaused()
+            ? "Pause pairing with " + entryUID
+            : "Resume pairing with " + entryUID);
+
         // Flyout Menu
         if (rightSideStart == 0f)
         {
@@ -169,91 +403,90 @@ public class DrawUserPair : DrawPairBase
         }
         if (ImGui.BeginPopup("User Flyout Menu"))
         {
-            UiSharedService.DrawWithID($"buttons-{_pair.UserData.UID}", () => DrawPairedClientMenu(_pair));
+            UiSharedService.DrawWithID($"buttons-{_pair.UserData.UID}", () =>
+            {
+                ImGui.TextUnformatted("Common Pair Functions");
+                DrawCommonClientMenu();
+                ImGui.Separator();
+                DrawPairedClientMenu();
+                if (_menuRenderWidth <= 0)
+                {
+                    _menuRenderWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
+                }
+            });
+
             ImGui.EndPopup();
         }
 
         return rightSideStart;
     }
 
-    private void DrawPairedClientMenu(Pair entry)
+    private void DrawSyncshellMenu(GroupFullInfoDto group, bool selfIsOwner, bool selfIsModerator, bool userIsPinned, bool userIsModerator)
     {
-        if (!entry.IsPaused)
+        if (selfIsOwner || ((selfIsModerator) && (!userIsModerator)))
         {
-            if (UiSharedService.IconTextButton(FontAwesomeIcon.User, "Open Profile"))
+            ImGui.TextUnformatted("Syncshell Moderator Functions");
-            {
+            var pinText = userIsPinned ? "Unpin user" : "Pin user";
-                _displayHandler.OpenProfile(entry);
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Thumbtack, pinText, _menuRenderWidth, true))
-                ImGui.CloseCurrentPopup();
-            }
-            UiSharedService.AttachToolTip("Opens the profile for this user in a new window");
-        }
-        if (entry.IsVisible)
-        {
-            if (UiSharedService.IconTextButton(FontAwesomeIcon.Sync, "Reload last data"))
-            {
-                entry.ApplyLastReceivedData(forced: true);
-                ImGui.CloseCurrentPopup();
-            }
-            UiSharedService.AttachToolTip("This reapplies the last received character data to this character");
-        }
-
-        if (UiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Cycle pause state"))
-        {
-            _ = _apiController.CyclePause(entry.UserData);
-            ImGui.CloseCurrentPopup();
-        }
-        var entryUID = entry.UserData.AliasOrUID;
-        if (UiSharedService.IconTextButton(FontAwesomeIcon.Folder, "Pair Groups"))
-        {
-            _selectGroupForPairUi.Open(entry);
-        }
-        UiSharedService.AttachToolTip("Choose pair groups for " + entryUID);
-
-        var isDisableSounds = entry.UserPair!.OwnPermissions.IsDisableSounds();
-        string disableSoundsText = isDisableSounds ? "Enable sound sync" : "Disable sound sync";
-        var disableSoundsIcon = isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute;
-        if (UiSharedService.IconTextButton(disableSoundsIcon, disableSoundsText))
-        {
-            var permissions = entry.UserPair.OwnPermissions;
-            permissions.SetDisableSounds(!isDisableSounds);
-            _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(entry.UserData, permissions));
-        }
-
-        var isDisableAnims = entry.UserPair!.OwnPermissions.IsDisableAnimations();
-        string disableAnimsText = isDisableAnims ? "Enable animation sync" : "Disable animation sync";
-        var disableAnimsIcon = isDisableAnims ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop;
-        if (UiSharedService.IconTextButton(disableAnimsIcon, disableAnimsText))
-        {
-            var permissions = entry.UserPair.OwnPermissions;
-            permissions.SetDisableAnimations(!isDisableAnims);
-            _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(entry.UserData, permissions));
-        }
-
-        var isDisableVFX = entry.UserPair!.OwnPermissions.IsDisableVFX();
-        string disableVFXText = isDisableVFX ? "Enable VFX sync" : "Disable VFX sync";
-        var disableVFXIcon = isDisableVFX ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle;
-        if (UiSharedService.IconTextButton(disableVFXIcon, disableVFXText))
-        {
-            var permissions = entry.UserPair.OwnPermissions;
-            permissions.SetDisableVFX(!isDisableVFX);
-            _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(entry.UserData, permissions));
-        }
-
-        if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Unpair Permanently") && UiSharedService.CtrlPressed())
-        {
-            _ = _apiController.UserRemovePair(new(entry.UserData));
-        }
-        UiSharedService.AttachToolTip("Hold CTRL and click to unpair permanently from " + entryUID);
-
-        ImGui.Separator();
-        if (!entry.IsPaused)
-        {
-            if (UiSharedService.IconTextButton(FontAwesomeIcon.ExclamationTriangle, "Report Mare Profile"))
             {
                 ImGui.CloseCurrentPopup();
-                _showModalReport = true;
+                if (!group.GroupPairUserInfos.TryGetValue(_pair.UserData.UID, out var userinfo))
+                {
+                    userinfo = API.Data.Enum.GroupPairUserInfo.IsPinned;
+                }
+                else
+                {
+                    userinfo.SetPinned(!userinfo.IsPinned());
+                }
+                _ = _apiController.GroupSetUserInfo(new GroupPairUserInfoDto(group.Group, _pair.UserData, userinfo));
             }
-            UiSharedService.AttachToolTip("Report this users Mare Profile to the administrative team");
+            UiSharedService.AttachToolTip("Pin this user to the Syncshell. Pinned users will not be deleted in case of a manually initiated Syncshell clean");
+
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Remove user", _menuRenderWidth, true) && UiSharedService.CtrlPressed())
+            {
+                ImGui.CloseCurrentPopup();
+                _ = _apiController.GroupRemoveUser(new(group.Group, _pair.UserData));
+            }
+            UiSharedService.AttachToolTip("Hold CTRL and click to remove user " + (_pair.UserData.AliasOrUID) + " from Syncshell");
+
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.UserSlash, "Ban User", _menuRenderWidth, true))
+            {
+                _mediator.Publish(new OpenBanUserPopupMessage(_pair, group));
+                ImGui.CloseCurrentPopup();
+            }
+            UiSharedService.AttachToolTip("Ban user from this Syncshell");
+
+            ImGui.Separator();
+        }
+
+        if (selfIsOwner)
+        {
+            ImGui.TextUnformatted("Syncshell Owner Functions");
+            string modText = userIsModerator ? "Demod user" : "Mod user";
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.UserShield, modText, _menuRenderWidth, true) && UiSharedService.CtrlPressed())
+            {
+                ImGui.CloseCurrentPopup();
+                if (!group.GroupPairUserInfos.TryGetValue(_pair.UserData.UID, out var userinfo))
+                {
+                    userinfo = API.Data.Enum.GroupPairUserInfo.IsModerator;
+                }
+                else
+                {
+                    userinfo.SetModerator(!userinfo.IsModerator());
+                }
+
+                _ = _apiController.GroupSetUserInfo(new GroupPairUserInfoDto(group.Group, _pair.UserData, userinfo));
+            }
+            UiSharedService.AttachToolTip("Hold CTRL to change the moderator status for " + (_pair.UserData.AliasOrUID) + Environment.NewLine +
+                "Moderators can kick, ban/unban, pin/unpin users and clear the Syncshell.");
+
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Crown, "Transfer Ownership", _menuRenderWidth, true) && UiSharedService.CtrlPressed() && UiSharedService.ShiftPressed())
+            {
+                ImGui.CloseCurrentPopup();
+                _ = _apiController.GroupChangeOwnership(new(group.Group, _pair.UserData));
+            }
+            UiSharedService.AttachToolTip("Hold CTRL and SHIFT and click to transfer ownership of this Syncshell to "
+                + (_pair.UserData.AliasOrUID) + Environment.NewLine + "WARNING: This action is irreversible.");
         }
     }
 }

MareSynchronos/UI/Components/GroupPanel.cs

@@ -1,765 +0,0 @@
-using Dalamud.Interface.Components;
-using Dalamud.Interface;
-using Dalamud.Utility;
-using ImGuiNET;
-using MareSynchronos.WebAPI;
-using System.Numerics;
-using System.Globalization;
-using MareSynchronos.API.Data;
-using MareSynchronos.API.Dto.Group;
-using MareSynchronos.API.Data.Enum;
-using MareSynchronos.API.Data.Extensions;
-using MareSynchronos.API.Data.Comparer;
-using MareSynchronos.PlayerData.Pairs;
-using MareSynchronos.Services.ServerConfiguration;
-using MareSynchronos.UI.Components;
-using MareSynchronos.UI.Handlers;
-using Dalamud.Interface.Utility;
-
-namespace MareSynchronos.UI;
-
-internal sealed class GroupPanel
-{
-    private readonly Dictionary<string, bool> _expandedGroupState = new(StringComparer.Ordinal);
-    private readonly CompactUi _mainUi;
-    private readonly PairManager _pairManager;
-    private readonly ServerConfigurationManager _serverConfigurationManager;
-    private readonly Dictionary<string, bool> _showGidForEntry = new(StringComparer.Ordinal);
-    private readonly UidDisplayHandler _uidDisplayHandler;
-    private readonly UiSharedService _uiShared;
-    private List<BannedGroupUserDto> _bannedUsers = new();
-    private int _bulkInviteCount = 10;
-    private List<string> _bulkOneTimeInvites = new();
-    private string _editGroupComment = string.Empty;
-    private string _editGroupEntry = string.Empty;
-    private bool _errorGroupCreate = false;
-    private bool _errorGroupJoin;
-    private bool _isPasswordValid;
-    private GroupPasswordDto? _lastCreatedGroup = null;
-    private bool _modalBanListOpened;
-    private bool _modalBulkOneTimeInvitesOpened;
-    private bool _modalChangePwOpened;
-    private string _newSyncShellPassword = string.Empty;
-    private bool _showModalBanList = false;
-    private bool _showModalBulkOneTimeInvites = false;
-    private bool _showModalChangePassword;
-    private bool _showModalCreateGroup;
-    private bool _showModalEnterPassword;
-    private string _syncShellPassword = string.Empty;
-    private string _syncShellToJoin = string.Empty;
-
-    public GroupPanel(CompactUi mainUi, UiSharedService uiShared, PairManager pairManager, UidDisplayHandler uidDisplayHandler, ServerConfigurationManager serverConfigurationManager)
-    {
-        _mainUi = mainUi;
-        _uiShared = uiShared;
-        _pairManager = pairManager;
-        _uidDisplayHandler = uidDisplayHandler;
-        _serverConfigurationManager = serverConfigurationManager;
-    }
-
-    private ApiController ApiController => _uiShared.ApiController;
-
-    public void DrawSyncshells()
-    {
-        UiSharedService.DrawWithID("addsyncshell", DrawAddSyncshell);
-        UiSharedService.DrawWithID("syncshelllist", DrawSyncshellList);
-        _mainUi.TransferPartHeight = ImGui.GetCursorPosY();
-    }
-
-    private void DrawAddSyncshell()
-    {
-        var buttonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Plus);
-        ImGui.SetNextItemWidth(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X - buttonSize.X);
-        ImGui.InputTextWithHint("##syncshellid", "Syncshell GID/Alias (leave empty to create)", ref _syncShellToJoin, 20);
-        ImGui.SameLine(ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth() - buttonSize.X);
-
-        bool userCanJoinMoreGroups = _pairManager.GroupPairs.Count < ApiController.ServerInfo.MaxGroupsJoinedByUser;
-        bool userCanCreateMoreGroups = _pairManager.GroupPairs.Count(u => string.Equals(u.Key.Owner.UID, ApiController.UID, StringComparison.Ordinal)) < ApiController.ServerInfo.MaxGroupsCreatedByUser;
-        bool alreadyInGroup = _pairManager.GroupPairs.Select(p => p.Key).Any(p => string.Equals(p.Group.Alias, _syncShellToJoin, StringComparison.Ordinal)
-            || string.Equals(p.Group.GID, _syncShellToJoin, StringComparison.Ordinal));
-
-        if (alreadyInGroup) ImGui.BeginDisabled();
-        if (ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
-        {
-            if (!string.IsNullOrEmpty(_syncShellToJoin))
-            {
-                if (userCanJoinMoreGroups)
-                {
-                    _errorGroupJoin = false;
-                    _showModalEnterPassword = true;
-                    ImGui.OpenPopup("Enter Syncshell Password");
-                }
-            }
-            else
-            {
-                if (userCanCreateMoreGroups)
-                {
-                    _lastCreatedGroup = null;
-                    _errorGroupCreate = false;
-                    _showModalCreateGroup = true;
-                    ImGui.OpenPopup("Create Syncshell");
-                }
-            }
-        }
-        UiSharedService.AttachToolTip(_syncShellToJoin.IsNullOrEmpty()
-            ? (userCanCreateMoreGroups ? "Create Syncshell" : $"You cannot create more than {ApiController.ServerInfo.MaxGroupsCreatedByUser} Syncshells")
-            : (userCanJoinMoreGroups ? "Join Syncshell" + _syncShellToJoin : $"You cannot join more than {ApiController.ServerInfo.MaxGroupsJoinedByUser} Syncshells"));
-
-        if (alreadyInGroup) ImGui.EndDisabled();
-
-        if (ImGui.BeginPopupModal("Enter Syncshell Password", ref _showModalEnterPassword, UiSharedService.PopupWindowFlags))
-        {
-            UiSharedService.TextWrapped("Before joining any Syncshells please be aware that you will be automatically paired with everyone in the Syncshell.");
-            ImGui.Separator();
-            UiSharedService.TextWrapped("Enter the password for Syncshell " + _syncShellToJoin + ":");
-            ImGui.SetNextItemWidth(-1);
-            ImGui.InputTextWithHint("##password", _syncShellToJoin + " Password", ref _syncShellPassword, 255, ImGuiInputTextFlags.Password);
-            if (_errorGroupJoin)
-            {
-                UiSharedService.ColorTextWrapped($"An error occured during joining of this Syncshell: you either have joined the maximum amount of Syncshells ({ApiController.ServerInfo.MaxGroupsJoinedByUser}), " +
-                    $"it does not exist, the password you entered is wrong, you already joined the Syncshell, the Syncshell is full ({ApiController.ServerInfo.MaxGroupUserCount} users) or the Syncshell has closed invites.",
-                    new Vector4(1, 0, 0, 1));
-            }
-            if (ImGui.Button("Join " + _syncShellToJoin))
-            {
-                var shell = _syncShellToJoin;
-                var pw = _syncShellPassword;
-                _errorGroupJoin = !ApiController.GroupJoin(new(new GroupData(shell), pw)).Result;
-                if (!_errorGroupJoin)
-                {
-                    _syncShellToJoin = string.Empty;
-                    _showModalEnterPassword = false;
-                }
-                _syncShellPassword = string.Empty;
-            }
-            UiSharedService.SetScaledWindowSize(290);
-            ImGui.EndPopup();
-        }
-
-        if (ImGui.BeginPopupModal("Create Syncshell", ref _showModalCreateGroup, UiSharedService.PopupWindowFlags))
-        {
-            UiSharedService.TextWrapped("Press the button below to create a new Syncshell.");
-            ImGui.SetNextItemWidth(200);
-            if (ImGui.Button("Create Syncshell"))
-            {
-                try
-                {
-                    _lastCreatedGroup = ApiController.GroupCreate().Result;
-                }
-                catch
-                {
-                    _lastCreatedGroup = null;
-                    _errorGroupCreate = true;
-                }
-            }
-
-            if (_lastCreatedGroup != null)
-            {
-                ImGui.Separator();
-                _errorGroupCreate = false;
-                ImGui.TextUnformatted("Syncshell ID: " + _lastCreatedGroup.Group.GID);
-                ImGui.AlignTextToFramePadding();
-                ImGui.TextUnformatted("Syncshell Password: " + _lastCreatedGroup.Password);
-                ImGui.SameLine();
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Copy))
-                {
-                    ImGui.SetClipboardText(_lastCreatedGroup.Password);
-                }
-                UiSharedService.TextWrapped("You can change the Syncshell password later at any time.");
-            }
-
-            if (_errorGroupCreate)
-            {
-                UiSharedService.ColorTextWrapped("You are already owner of the maximum amount of Syncshells (3) or joined the maximum amount of Syncshells (6). Relinquish ownership of your own Syncshells to someone else or leave existing Syncshells.",
-                    new Vector4(1, 0, 0, 1));
-            }
-
-            UiSharedService.SetScaledWindowSize(350);
-            ImGui.EndPopup();
-        }
-
-        ImGuiHelpers.ScaledDummy(2);
-    }
-
-    private void DrawSyncshell(GroupFullInfoDto groupDto, List<Pair> pairsInGroup)
-    {
-        var name = groupDto.Group.Alias ?? groupDto.GID;
-        if (!_expandedGroupState.TryGetValue(groupDto.GID, out bool isExpanded))
-        {
-            isExpanded = false;
-            _expandedGroupState.Add(groupDto.GID, isExpanded);
-        }
-        var icon = isExpanded ? FontAwesomeIcon.CaretSquareDown : FontAwesomeIcon.CaretSquareRight;
-        var collapseButton = UiSharedService.GetIconButtonSize(icon);
-        ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(0, 0, 0, 0));
-        ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(0, 0, 0, 0));
-        if (ImGuiComponents.IconButton(icon))
-        {
-            _expandedGroupState[groupDto.GID] = !_expandedGroupState[groupDto.GID];
-        }
-        ImGui.PopStyleColor(2);
-        ImGui.SameLine(ImGui.GetWindowContentRegionMin().X + collapseButton.X);
-        var pauseIcon = groupDto.GroupUserPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
-        if (ImGuiComponents.IconButton(pauseIcon))
-        {
-            var userPerm = groupDto.GroupUserPermissions ^ GroupUserPermissions.Paused;
-            _ = ApiController.GroupChangeIndividualPermissionState(new GroupPairUserPermissionDto(groupDto.Group, new UserData(ApiController.UID), userPerm));
-        }
-        UiSharedService.AttachToolTip((groupDto.GroupUserPermissions.IsPaused() ? "Resume" : "Pause") + " pairing with all users in this Syncshell");
-        ImGui.SameLine();
-
-        var textIsGid = true;
-        string groupName = groupDto.GroupAliasOrGID;
-
-        if (string.Equals(groupDto.OwnerUID, ApiController.UID, StringComparison.Ordinal))
-        {
-            ImGui.PushFont(UiBuilder.IconFont);
-            ImGui.Text(FontAwesomeIcon.Crown.ToIconString());
-            ImGui.PopFont();
-            UiSharedService.AttachToolTip("You are the owner of Syncshell " + groupName);
-            ImGui.SameLine();
-        }
-        else if (groupDto.GroupUserInfo.IsModerator())
-        {
-            ImGui.PushFont(UiBuilder.IconFont);
-            ImGui.Text(FontAwesomeIcon.UserShield.ToIconString());
-            ImGui.PopFont();
-            UiSharedService.AttachToolTip("You are a moderator of Syncshell " + groupName);
-            ImGui.SameLine();
-        }
-
-        _showGidForEntry.TryGetValue(groupDto.GID, out var showGidInsteadOfName);
-        var groupComment = _serverConfigurationManager.GetNoteForGid(groupDto.GID);
-        if (!showGidInsteadOfName && !string.IsNullOrEmpty(groupComment))
-        {
-            groupName = groupComment;
-            textIsGid = false;
-        }
-
-        if (!string.Equals(_editGroupEntry, groupDto.GID, StringComparison.Ordinal))
-        {
-            if (textIsGid) ImGui.PushFont(UiBuilder.MonoFont);
-            ImGui.TextUnformatted(groupName);
-            if (textIsGid) ImGui.PopFont();
-            UiSharedService.AttachToolTip("Left click to switch between GID display and comment" + Environment.NewLine +
-                          "Right click to change comment for " + groupName + Environment.NewLine + Environment.NewLine
-                          + "Users: " + (pairsInGroup.Count + 1) + ", Owner: " + groupDto.OwnerAliasOrUID);
-            if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
-            {
-                var prevState = textIsGid;
-                if (_showGidForEntry.ContainsKey(groupDto.GID))
-                {
-                    prevState = _showGidForEntry[groupDto.GID];
-                }
-
-                _showGidForEntry[groupDto.GID] = !prevState;
-            }
-
-            if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
-            {
-                _serverConfigurationManager.SetNoteForGid(_editGroupEntry, _editGroupComment);
-                _editGroupComment = _serverConfigurationManager.GetNoteForGid(groupDto.GID) ?? string.Empty;
-                _editGroupEntry = groupDto.GID;
-            }
-        }
-        else
-        {
-            var buttonSizes = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars).X + UiSharedService.GetIconSize(FontAwesomeIcon.LockOpen).X;
-            ImGui.SetNextItemWidth(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetCursorPosX() - buttonSizes - ImGui.GetStyle().ItemSpacing.X * 2);
-            if (ImGui.InputTextWithHint("", "Comment/Notes", ref _editGroupComment, 255, ImGuiInputTextFlags.EnterReturnsTrue))
-            {
-                _serverConfigurationManager.SetNoteForGid(groupDto.GID, _editGroupComment);
-                _editGroupEntry = string.Empty;
-            }
-
-            if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
-            {
-                _editGroupEntry = string.Empty;
-            }
-            UiSharedService.AttachToolTip("Hit ENTER to save\nRight click to cancel");
-        }
-
-        UiSharedService.DrawWithID(groupDto.GID + "settings", () => DrawSyncShellButtons(groupDto, pairsInGroup));
-
-        if (_showModalBanList && !_modalBanListOpened)
-        {
-            _modalBanListOpened = true;
-            ImGui.OpenPopup("Manage Banlist for " + groupDto.GID);
-        }
-
-        if (!_showModalBanList) _modalBanListOpened = false;
-
-        if (ImGui.BeginPopupModal("Manage Banlist for " + groupDto.GID, ref _showModalBanList, UiSharedService.PopupWindowFlags))
-        {
-            if (UiSharedService.IconTextButton(FontAwesomeIcon.Retweet, "Refresh Banlist from Server"))
-            {
-                _bannedUsers = ApiController.GroupGetBannedUsers(groupDto).Result;
-            }
-
-            if (ImGui.BeginTable("bannedusertable" + groupDto.GID, 6, ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.ScrollY))
-            {
-                ImGui.TableSetupColumn("UID", ImGuiTableColumnFlags.None, 1);
-                ImGui.TableSetupColumn("Alias", ImGuiTableColumnFlags.None, 1);
-                ImGui.TableSetupColumn("By", ImGuiTableColumnFlags.None, 1);
-                ImGui.TableSetupColumn("Date", ImGuiTableColumnFlags.None, 2);
-                ImGui.TableSetupColumn("Reason", ImGuiTableColumnFlags.None, 3);
-                ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 1);
-
-                ImGui.TableHeadersRow();
-
-                foreach (var bannedUser in _bannedUsers.ToList())
-                {
-                    ImGui.TableNextColumn();
-                    ImGui.TextUnformatted(bannedUser.UID);
-                    ImGui.TableNextColumn();
-                    ImGui.TextUnformatted(bannedUser.UserAlias ?? string.Empty);
-                    ImGui.TableNextColumn();
-                    ImGui.TextUnformatted(bannedUser.BannedBy);
-                    ImGui.TableNextColumn();
-                    ImGui.TextUnformatted(bannedUser.BannedOn.ToLocalTime().ToString(CultureInfo.CurrentCulture));
-                    ImGui.TableNextColumn();
-                    UiSharedService.TextWrapped(bannedUser.Reason);
-                    ImGui.TableNextColumn();
-                    if (UiSharedService.IconTextButton(FontAwesomeIcon.Check, "Unban#" + bannedUser.UID))
-                    {
-                        _ = ApiController.GroupUnbanUser(bannedUser);
-                        _bannedUsers.RemoveAll(b => string.Equals(b.UID, bannedUser.UID, StringComparison.Ordinal));
-                    }
-                }
-
-                ImGui.EndTable();
-            }
-            UiSharedService.SetScaledWindowSize(700, 300);
-            ImGui.EndPopup();
-        }
-
-        if (_showModalChangePassword && !_modalChangePwOpened)
-        {
-            _modalChangePwOpened = true;
-            ImGui.OpenPopup("Change Syncshell Password");
-        }
-
-        if (!_showModalChangePassword) _modalChangePwOpened = false;
-
-        if (ImGui.BeginPopupModal("Change Syncshell Password", ref _showModalChangePassword, UiSharedService.PopupWindowFlags))
-        {
-            UiSharedService.TextWrapped("Enter the new Syncshell password for Syncshell " + name + " here.");
-            UiSharedService.TextWrapped("This action is irreversible");
-            ImGui.SetNextItemWidth(-1);
-            ImGui.InputTextWithHint("##changepw", "New password for " + name, ref _newSyncShellPassword, 255);
-            if (ImGui.Button("Change password"))
-            {
-                var pw = _newSyncShellPassword;
-                _isPasswordValid = ApiController.GroupChangePassword(new(groupDto.Group, pw)).Result;
-                _newSyncShellPassword = string.Empty;
-                if (_isPasswordValid) _showModalChangePassword = false;
-            }
-
-            if (!_isPasswordValid)
-            {
-                UiSharedService.ColorTextWrapped("The selected password is too short. It must be at least 10 characters.", new Vector4(1, 0, 0, 1));
-            }
-
-            UiSharedService.SetScaledWindowSize(290);
-            ImGui.EndPopup();
-        }
-
-        if (_showModalBulkOneTimeInvites && !_modalBulkOneTimeInvitesOpened)
-        {
-            _modalBulkOneTimeInvitesOpened = true;
-            ImGui.OpenPopup("Create Bulk One-Time Invites");
-        }
-
-        if (!_showModalBulkOneTimeInvites) _modalBulkOneTimeInvitesOpened = false;
-
-        if (ImGui.BeginPopupModal("Create Bulk One-Time Invites", ref _showModalBulkOneTimeInvites, UiSharedService.PopupWindowFlags))
-        {
-            UiSharedService.TextWrapped("This allows you to create up to 100 one-time invites at once for the Syncshell " + name + "." + Environment.NewLine
-                + "The invites are valid for 24h after creation and will automatically expire.");
-            ImGui.Separator();
-            if (_bulkOneTimeInvites.Count == 0)
-            {
-                ImGui.SetNextItemWidth(-1);
-                ImGui.SliderInt("Amount##bulkinvites", ref _bulkInviteCount, 1, 100);
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.MailBulk, "Create invites"))
-                {
-                    _bulkOneTimeInvites = ApiController.GroupCreateTempInvite(groupDto, _bulkInviteCount).Result;
-                }
-            }
-            else
-            {
-                UiSharedService.TextWrapped("A total of " + _bulkOneTimeInvites.Count + " invites have been created.");
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.Copy, "Copy invites to clipboard"))
-                {
-                    ImGui.SetClipboardText(string.Join(Environment.NewLine, _bulkOneTimeInvites));
-                }
-            }
-
-            UiSharedService.SetScaledWindowSize(290);
-            ImGui.EndPopup();
-        }
-
-        ImGui.Indent(collapseButton.X);
-        if (_expandedGroupState[groupDto.GID])
-        {
-            var visibleUsers = pairsInGroup.Where(u => u.IsVisible)
-                .OrderByDescending(u => string.Equals(u.UserData.UID, groupDto.OwnerUID, StringComparison.Ordinal))
-                .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsModerator())
-                .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsPinned())
-                .ThenBy(u => u.GetNote() ?? u.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase)
-                .Select(c => new DrawGroupPair(groupDto.GID + c.UserData.UID, c, ApiController, groupDto, c.GroupPair.Single(g => GroupDataComparer.Instance.Equals(g.Key.Group, groupDto.Group)).Value,
-                    _uidDisplayHandler))
-                .ToList();
-            var onlineUsers = pairsInGroup.Where(u => u.IsOnline && !u.IsVisible)
-                .OrderByDescending(u => string.Equals(u.UserData.UID, groupDto.OwnerUID, StringComparison.Ordinal))
-                .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsModerator())
-                .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsPinned())
-                .ThenBy(u => u.GetNote() ?? u.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase)
-                .Select(c => new DrawGroupPair(groupDto.GID + c.UserData.UID, c, ApiController, groupDto, c.GroupPair.Single(g => GroupDataComparer.Instance.Equals(g.Key.Group, groupDto.Group)).Value,
-                    _uidDisplayHandler))
-                .ToList();
-            var offlineUsers = pairsInGroup.Where(u => !u.IsOnline && !u.IsVisible)
-                .OrderByDescending(u => string.Equals(u.UserData.UID, groupDto.OwnerUID, StringComparison.Ordinal))
-                .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsModerator())
-                .ThenByDescending(u => u.GroupPair[groupDto].GroupPairStatusInfo.IsPinned())
-                .ThenBy(u => u.GetNote() ?? u.UserData.AliasOrUID, StringComparer.OrdinalIgnoreCase)
-                .Select(c => new DrawGroupPair(groupDto.GID + c.UserData.UID, c, ApiController, groupDto, c.GroupPair.Single(g => GroupDataComparer.Instance.Equals(g.Key.Group, groupDto.Group)).Value,
-                    _uidDisplayHandler))
-                .ToList();
-
-            if (visibleUsers.Any())
-            {
-                ImGui.Text("Visible");
-                ImGui.Separator();
-                foreach (var entry in visibleUsers)
-                {
-                    UiSharedService.DrawWithID(groupDto.GID + entry.UID, () => entry.DrawPairedClient());
-                }
-            }
-
-            if (onlineUsers.Any())
-            {
-                ImGui.Text("Online");
-                ImGui.Separator();
-                foreach (var entry in onlineUsers)
-                {
-                    UiSharedService.DrawWithID(groupDto.GID + entry.UID, () => entry.DrawPairedClient());
-                }
-            }
-
-            if (offlineUsers.Any())
-            {
-                ImGui.Text("Offline/Unknown");
-                ImGui.Separator();
-                foreach (var entry in offlineUsers)
-                {
-                    UiSharedService.DrawWithID(groupDto.GID + entry.UID, () => entry.DrawPairedClient());
-                }
-            }
-
-            ImGui.Separator();
-            ImGui.Unindent(ImGui.GetStyle().ItemSpacing.X / 2);
-        }
-        ImGui.Unindent(collapseButton.X);
-    }
-
-    private void DrawSyncShellButtons(GroupFullInfoDto groupDto, List<Pair> groupPairs)
-    {
-        var infoIcon = FontAwesomeIcon.InfoCircle;
-
-        bool invitesEnabled = !groupDto.GroupPermissions.IsDisableInvites();
-        var soundsDisabled = groupDto.GroupPermissions.IsDisableSounds();
-        var animDisabled = groupDto.GroupPermissions.IsDisableAnimations();
-        var vfxDisabled = groupDto.GroupPermissions.IsDisableVFX();
-
-        var userSoundsDisabled = groupDto.GroupUserPermissions.IsDisableSounds();
-        var userAnimDisabled = groupDto.GroupUserPermissions.IsDisableAnimations();
-        var userVFXDisabled = groupDto.GroupUserPermissions.IsDisableVFX();
-
-        bool showInfoIcon = !invitesEnabled || soundsDisabled || animDisabled || vfxDisabled || userSoundsDisabled || userAnimDisabled || userVFXDisabled;
-
-        var lockedIcon = invitesEnabled ? FontAwesomeIcon.LockOpen : FontAwesomeIcon.Lock;
-        var animIcon = animDisabled ? FontAwesomeIcon.Stop : FontAwesomeIcon.Running;
-        var soundsIcon = soundsDisabled ? FontAwesomeIcon.VolumeOff : FontAwesomeIcon.VolumeUp;
-        var vfxIcon = vfxDisabled ? FontAwesomeIcon.Circle : FontAwesomeIcon.Sun;
-        var userAnimIcon = userAnimDisabled ? FontAwesomeIcon.Stop : FontAwesomeIcon.Running;
-        var userSoundsIcon = userSoundsDisabled ? FontAwesomeIcon.VolumeOff : FontAwesomeIcon.VolumeUp;
-        var userVFXIcon = userVFXDisabled ? FontAwesomeIcon.Circle : FontAwesomeIcon.Sun;
-
-        var iconSize = UiSharedService.GetIconSize(infoIcon);
-        var diffLockUnlockIcons = showInfoIcon ? (UiSharedService.GetIconSize(infoIcon).X - iconSize.X) / 2 : 0;
-        var barbuttonSize = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars);
-        var isOwner = string.Equals(groupDto.OwnerUID, ApiController.UID, StringComparison.Ordinal);
-
-        ImGui.SameLine(ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth() - barbuttonSize.X - (showInfoIcon ? iconSize.X : 0) - diffLockUnlockIcons - (showInfoIcon ? ImGui.GetStyle().ItemSpacing.X : 0));
-        if (showInfoIcon)
-        {
-            UiSharedService.FontText(infoIcon.ToIconString(), UiBuilder.IconFont);
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.BeginTooltip();
-                if (!invitesEnabled || soundsDisabled || animDisabled || vfxDisabled)
-                {
-                    ImGui.Text("Syncshell permissions");
-
-                    if (!invitesEnabled)
-                    {
-                        var lockedText = "Syncshell is closed for joining";
-                        UiSharedService.FontText(lockedIcon.ToIconString(), UiBuilder.IconFont);
-                        ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(lockedText);
-                    }
-
-                    if (soundsDisabled)
-                    {
-                        var soundsText = "Sound sync disabled through owner";
-                        UiSharedService.FontText(soundsIcon.ToIconString(), UiBuilder.IconFont);
-                        ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(soundsText);
-                    }
-
-                    if (animDisabled)
-                    {
-                        var animText = "Animation sync disabled through owner";
-                        UiSharedService.FontText(animIcon.ToIconString(), UiBuilder.IconFont);
-                        ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(animText);
-                    }
-
-                    if (vfxDisabled)
-                    {
-                        var vfxText = "VFX sync disabled through owner";
-                        UiSharedService.FontText(vfxIcon.ToIconString(), UiBuilder.IconFont);
-                        ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(vfxText);
-                    }
-                }
-
-                if (userSoundsDisabled || userAnimDisabled || userVFXDisabled)
-                {
-                    if (!invitesEnabled || soundsDisabled || animDisabled || vfxDisabled)
-                        ImGui.Separator();
-
-                    ImGui.Text("Your permissions");
-
-                    if (userSoundsDisabled)
-                    {
-                        var userSoundsText = "Sound sync disabled through you";
-                        UiSharedService.FontText(userSoundsIcon.ToIconString(), UiBuilder.IconFont);
-                        ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(userSoundsText);
-                    }
-
-                    if (userAnimDisabled)
-                    {
-                        var userAnimText = "Animation sync disabled through you";
-                        UiSharedService.FontText(userAnimIcon.ToIconString(), UiBuilder.IconFont);
-                        ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(userAnimText);
-                    }
-
-                    if (userVFXDisabled)
-                    {
-                        var userVFXText = "VFX sync disabled through you";
-                        UiSharedService.FontText(userVFXIcon.ToIconString(), UiBuilder.IconFont);
-                        ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
-                        ImGui.Text(userVFXText);
-                    }
-
-                    if (!invitesEnabled || soundsDisabled || animDisabled || vfxDisabled)
-                        UiSharedService.TextWrapped("Note that syncshell permissions for disabling take precedence over your own set permissions");
-                }
-                ImGui.EndTooltip();
-            }
-            ImGui.SameLine();
-        }
-
-        ImGui.SetCursorPosX(ImGui.GetCursorPosX() + diffLockUnlockIcons);
-        if (ImGuiComponents.IconButton(FontAwesomeIcon.Bars))
-        {
-            ImGui.OpenPopup("ShellPopup");
-        }
-
-        if (ImGui.BeginPopup("ShellPopup"))
-        {
-            if (UiSharedService.IconTextButton(FontAwesomeIcon.ArrowCircleLeft, "Leave Syncshell") && UiSharedService.CtrlPressed())
-            {
-                _ = ApiController.GroupLeave(groupDto);
-            }
-            UiSharedService.AttachToolTip("Hold CTRL and click to leave this Syncshell" + (!string.Equals(groupDto.OwnerUID, ApiController.UID, StringComparison.Ordinal) ? string.Empty : Environment.NewLine
-                + "WARNING: This action is irreversible" + Environment.NewLine + "Leaving an owned Syncshell will transfer the ownership to a random person in the Syncshell."));
-
-            if (UiSharedService.IconTextButton(FontAwesomeIcon.Copy, "Copy ID"))
-            {
-                ImGui.CloseCurrentPopup();
-                ImGui.SetClipboardText(groupDto.GroupAliasOrGID);
-            }
-            UiSharedService.AttachToolTip("Copy Syncshell ID to Clipboard");
-
-            if (UiSharedService.IconTextButton(FontAwesomeIcon.StickyNote, "Copy Notes"))
-            {
-                ImGui.CloseCurrentPopup();
-                ImGui.SetClipboardText(UiSharedService.GetNotes(groupPairs));
-            }
-            UiSharedService.AttachToolTip("Copies all your notes for all users in this Syncshell to the clipboard." + Environment.NewLine + "They can be imported via Settings -> Privacy -> Import Notes from Clipboard");
-
-            var soundsText = userSoundsDisabled ? "Enable sound sync" : "Disable sound sync";
-            if (UiSharedService.IconTextButton(userSoundsIcon, soundsText))
-            {
-                ImGui.CloseCurrentPopup();
-                var perm = groupDto.GroupUserPermissions;
-                perm.SetDisableSounds(!perm.IsDisableSounds());
-                _ = ApiController.GroupChangeIndividualPermissionState(new(groupDto.Group, new UserData(ApiController.UID), perm));
-            }
-            UiSharedService.AttachToolTip("Sets your allowance for sound synchronization for users of this syncshell."
-                + Environment.NewLine + "Disabling the synchronization will stop applying sound modifications for users of this syncshell."
-                + Environment.NewLine + "Note: this setting can be forcefully overridden to 'disabled' through the syncshell owner."
-                + Environment.NewLine + "Note: this setting does not apply to individual pairs that are also in the syncshell.");
-
-            var animText = userAnimDisabled ? "Enable animations sync" : "Disable animations sync";
-            if (UiSharedService.IconTextButton(userAnimIcon, animText))
-            {
-                ImGui.CloseCurrentPopup();
-                var perm = groupDto.GroupUserPermissions;
-                perm.SetDisableAnimations(!perm.IsDisableAnimations());
-                _ = ApiController.GroupChangeIndividualPermissionState(new(groupDto.Group, new UserData(ApiController.UID), perm));
-            }
-            UiSharedService.AttachToolTip("Sets your allowance for animations synchronization for users of this syncshell."
-                + Environment.NewLine + "Disabling the synchronization will stop applying animations modifications for users of this syncshell."
-                + Environment.NewLine + "Note: this setting might also affect sound synchronization"
-                + Environment.NewLine + "Note: this setting can be forcefully overridden to 'disabled' through the syncshell owner."
-                + Environment.NewLine + "Note: this setting does not apply to individual pairs that are also in the syncshell.");
-
-            var vfxText = userVFXDisabled ? "Enable VFX sync" : "Disable VFX sync";
-            if (UiSharedService.IconTextButton(userVFXIcon, vfxText))
-            {
-                ImGui.CloseCurrentPopup();
-                var perm = groupDto.GroupUserPermissions;
-                perm.SetDisableVFX(!perm.IsDisableVFX());
-                _ = ApiController.GroupChangeIndividualPermissionState(new(groupDto.Group, new UserData(ApiController.UID), perm));
-            }
-            UiSharedService.AttachToolTip("Sets your allowance for VFX synchronization for users of this syncshell."
-                                          + Environment.NewLine + "Disabling the synchronization will stop applying VFX modifications for users of this syncshell."
-                                          + Environment.NewLine + "Note: this setting might also affect animation synchronization to some degree"
-                                          + Environment.NewLine + "Note: this setting can be forcefully overridden to 'disabled' through the syncshell owner."
-                                          + Environment.NewLine + "Note: this setting does not apply to individual pairs that are also in the syncshell.");
-
-            if (isOwner || groupDto.GroupUserInfo.IsModerator())
-            {
-                ImGui.Separator();
-
-                var changedToIcon = invitesEnabled ? FontAwesomeIcon.LockOpen : FontAwesomeIcon.Lock;
-                if (UiSharedService.IconTextButton(changedToIcon, invitesEnabled ? "Lock Syncshell" : "Unlock Syncshell"))
-                {
-                    ImGui.CloseCurrentPopup();
-                    var groupPerm = groupDto.GroupPermissions;
-                    groupPerm.SetDisableInvites(invitesEnabled);
-                    _ = ApiController.GroupChangeGroupPermissionState(new GroupPermissionDto(groupDto.Group, groupPerm));
-                }
-                UiSharedService.AttachToolTip("Change Syncshell joining permissions" + Environment.NewLine + "Syncshell is currently " + (invitesEnabled ? "open" : "closed") + " for people to join");
-
-                if (isOwner)
-                {
-                    if (UiSharedService.IconTextButton(FontAwesomeIcon.Passport, "Change Password"))
-                    {
-                        ImGui.CloseCurrentPopup();
-                        _isPasswordValid = true;
-                        _showModalChangePassword = true;
-                    }
-                    UiSharedService.AttachToolTip("Change Syncshell Password");
-                }
-
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Clear Syncshell") && UiSharedService.CtrlPressed())
-                {
-                    ImGui.CloseCurrentPopup();
-                    _ = ApiController.GroupClear(groupDto);
-                }
-                UiSharedService.AttachToolTip("Hold CTRL and click to clear this Syncshell." + Environment.NewLine + "WARNING: this action is irreversible." + Environment.NewLine
-                    + "Clearing the Syncshell will remove all not pinned users from it.");
-
-                var groupSoundsText = soundsDisabled ? "Enable syncshell sound sync" : "Disable syncshell sound sync";
-                if (UiSharedService.IconTextButton(soundsIcon, groupSoundsText))
-                {
-                    ImGui.CloseCurrentPopup();
-                    var perm = groupDto.GroupPermissions;
-                    perm.SetDisableSounds(!perm.IsDisableSounds());
-                    _ = ApiController.GroupChangeGroupPermissionState(new(groupDto.Group, perm));
-                }
-                UiSharedService.AttachToolTip("Sets syncshell-wide allowance for sound synchronization for all users." + Environment.NewLine
-                    + "Note: users that are individually paired with others in the syncshell will ignore this setting." + Environment.NewLine
-                    + "Note: if the synchronization is enabled, users can individually override this setting to disabled.");
-
-                var groupAnimText = animDisabled ? "Enable syncshell animations sync" : "Disable syncshell animations sync";
-                if (UiSharedService.IconTextButton(animIcon, groupAnimText))
-                {
-                    ImGui.CloseCurrentPopup();
-                    var perm = groupDto.GroupPermissions;
-                    perm.SetDisableAnimations(!perm.IsDisableAnimations());
-                    _ = ApiController.GroupChangeGroupPermissionState(new(groupDto.Group, perm));
-                }
-                UiSharedService.AttachToolTip("Sets syncshell-wide allowance for animations synchronization for all users." + Environment.NewLine
-                    + "Note: users that are individually paired with others in the syncshell will ignore this setting." + Environment.NewLine
-                    + "Note: if the synchronization is enabled, users can individually override this setting to disabled.");
-
-                var groupVFXText = vfxDisabled ? "Enable syncshell VFX sync" : "Disable syncshell VFX sync";
-                if (UiSharedService.IconTextButton(vfxIcon, groupVFXText))
-                {
-                    ImGui.CloseCurrentPopup();
-                    var perm = groupDto.GroupPermissions;
-                    perm.SetDisableVFX(!perm.IsDisableVFX());
-                    _ = ApiController.GroupChangeGroupPermissionState(new(groupDto.Group, perm));
-                }
-                UiSharedService.AttachToolTip("Sets syncshell-wide allowance for VFX synchronization for all users." + Environment.NewLine
-                    + "Note: users that are individually paired with others in the syncshell will ignore this setting." + Environment.NewLine
-                    + "Note: if the synchronization is enabled, users can individually override this setting to disabled.");
-
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Single one-time invite"))
-                {
-                    ImGui.CloseCurrentPopup();
-                    ImGui.SetClipboardText(ApiController.GroupCreateTempInvite(groupDto, 1).Result.FirstOrDefault() ?? string.Empty);
-                }
-                UiSharedService.AttachToolTip("Creates a single-use password for joining the syncshell which is valid for 24h and copies it to the clipboard.");
-
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.MailBulk, "Bulk one-time invites"))
-                {
-                    ImGui.CloseCurrentPopup();
-                    _showModalBulkOneTimeInvites = true;
-                    _bulkOneTimeInvites.Clear();
-                }
-                UiSharedService.AttachToolTip("Opens a dialog to create up to 100 single-use passwords for joining the syncshell.");
-
-                if (UiSharedService.IconTextButton(FontAwesomeIcon.Ban, "Manage Banlist"))
-                {
-                    ImGui.CloseCurrentPopup();
-                    _showModalBanList = true;
-                    _bannedUsers = ApiController.GroupGetBannedUsers(groupDto).Result;
-                }
-
-                if (isOwner)
-                {
-                    if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Syncshell") && UiSharedService.CtrlPressed() && UiSharedService.ShiftPressed())
-                    {
-                        ImGui.CloseCurrentPopup();
-                        _ = ApiController.GroupDelete(groupDto);
-                    }
-                    UiSharedService.AttachToolTip("Hold CTRL and Shift and click to delete this Syncshell." + Environment.NewLine + "WARNING: this action is irreversible.");
-                }
-            }
-
-            ImGui.EndPopup();
-        }
-    }
-
-    private void DrawSyncshellList()
-    {
-        var ySize = _mainUi.TransferPartHeight == 0
-            ? 1
-            : (ImGui.GetWindowContentRegionMax().Y - ImGui.GetWindowContentRegionMin().Y) - _mainUi.TransferPartHeight - ImGui.GetCursorPosY();
-        ImGui.BeginChild("list", new Vector2(_mainUi.WindowContentWidth, ySize), border: false);
-        foreach (var entry in _pairManager.GroupPairs.OrderBy(g => g.Key.Group.AliasOrGID, StringComparer.OrdinalIgnoreCase).ToList())
-        {
-            UiSharedService.DrawWithID(entry.Key.Group.GID, () => DrawSyncshell(entry.Key, entry.Value));
-        }
-        ImGui.EndChild();
-    }
-}

MareSynchronos/UI/Components/IDrawFolder.cs

@@ -0,0 +1,6 @@
+namespace MareSynchronos.UI.Components;
+
+public interface IDrawFolder
+{
+    void Draw();
+}

MareSynchronos/UI/Components/PairGroupsUi.cs

@@ -1,249 +0,0 @@
-using Dalamud.Interface;
-using Dalamud.Interface.Components;
-using ImGuiNET;
-using MareSynchronos.API.Data.Extensions;
-using MareSynchronos.MareConfiguration;
-using MareSynchronos.UI.Handlers;
-using MareSynchronos.WebAPI;
-
-namespace MareSynchronos.UI.Components;
-
-public class PairGroupsUi
-{
-    private readonly ApiController _apiController;
-    private readonly MareConfigService _mareConfig;
-    private readonly SelectPairForGroupUi _selectGroupForPairUi;
-    private readonly TagHandler _tagHandler;
-
-    public PairGroupsUi(MareConfigService mareConfig, TagHandler tagHandler, ApiController apiController, SelectPairForGroupUi selectGroupForPairUi)
-    {
-        _mareConfig = mareConfig;
-        _tagHandler = tagHandler;
-        _apiController = apiController;
-        _selectGroupForPairUi = selectGroupForPairUi;
-    }
-
-    public void Draw<T>(List<T> visibleUsers, List<T> onlineUsers, List<T> offlineUsers) where T : DrawPairBase
-    {
-        // Only render those tags that actually have pairs in them, otherwise
-        // we can end up with a bunch of useless pair groups
-        var tagsWithPairsInThem = _tagHandler.GetAllTagsSorted();
-        var allUsers = visibleUsers.Concat(onlineUsers).Concat(offlineUsers).ToList();
-        if (typeof(T) == typeof(DrawUserPair))
-        {
-            DrawUserPairs(tagsWithPairsInThem, allUsers.Cast<DrawUserPair>().ToList(), visibleUsers.Cast<DrawUserPair>(), onlineUsers.Cast<DrawUserPair>(), offlineUsers.Cast<DrawUserPair>());
-        }
-    }
-
-    private void DrawButtons(string tag, List<DrawUserPair> availablePairsInThisTag)
-    {
-        var allArePaused = availablePairsInThisTag.All(pair => pair.UserPair!.OwnPermissions.IsPaused());
-        var pauseButton = allArePaused ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
-        var flyoutMenuX = UiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars).X;
-        var pauseButtonX = UiSharedService.GetIconButtonSize(pauseButton).X;
-        var windowX = ImGui.GetWindowContentRegionMin().X;
-        var windowWidth = UiSharedService.GetWindowContentRegionWidth();
-        var spacingX = ImGui.GetStyle().ItemSpacing.X;
-
-        var buttonPauseOffset = windowX + windowWidth - flyoutMenuX - spacingX - pauseButtonX;
-        ImGui.SameLine(buttonPauseOffset);
-        if (ImGuiComponents.IconButton(pauseButton))
-        {
-            // If all of the currently visible pairs (after applying filters to the pairs)
-            // are paused we display a resume button to resume all currently visible (after filters)
-            // pairs. Otherwise, we just pause all the remaining pairs.
-            if (allArePaused)
-            {
-                // If all are paused => resume all
-                ResumeAllPairs(availablePairsInThisTag);
-            }
-            else
-            {
-                // otherwise pause all remaining
-                PauseRemainingPairs(availablePairsInThisTag);
-            }
-        }
-        if (allArePaused)
-        {
-            UiSharedService.AttachToolTip($"Resume pairing with all pairs in {tag}");
-        }
-        else
-        {
-            UiSharedService.AttachToolTip($"Pause pairing with all pairs in {tag}");
-        }
-
-        var buttonDeleteOffset = windowX + windowWidth - flyoutMenuX;
-        ImGui.SameLine(buttonDeleteOffset);
-        if (ImGuiComponents.IconButton(FontAwesomeIcon.Bars))
-        {
-            ImGui.OpenPopup("Group Flyout Menu");
-        }
-
-        if (ImGui.BeginPopup("Group Flyout Menu"))
-        {
-            UiSharedService.DrawWithID($"buttons-{tag}", () => DrawGroupMenu(tag));
-            ImGui.EndPopup();
-        }
-    }
-
-    private void DrawCategory(string tag, IEnumerable<DrawPairBase> onlineUsers, IEnumerable<DrawPairBase> allUsers, IEnumerable<DrawPairBase>? visibleUsers = null)
-    {
-        IEnumerable<DrawPairBase> usersInThisTag;
-        HashSet<string>? otherUidsTaggedWithTag = null;
-        bool isSpecialTag = false;
-        int visibleInThisTag = 0;
-        if (tag is TagHandler.CustomOfflineTag or TagHandler.CustomOnlineTag or TagHandler.CustomVisibleTag or TagHandler.CustomUnpairedTag)
-        {
-            usersInThisTag = onlineUsers;
-            isSpecialTag = true;
-        }
-        else
-        {
-            otherUidsTaggedWithTag = _tagHandler.GetOtherUidsForTag(tag);
-            usersInThisTag = onlineUsers
-                .Where(pair => otherUidsTaggedWithTag.Contains(pair.UID))
-                .ToList();
-            visibleInThisTag = visibleUsers?.Count(p => otherUidsTaggedWithTag.Contains(p.UID)) ?? 0;
-        }
-
-        if (isSpecialTag && !usersInThisTag.Any()) return;
-
-        DrawName(tag, isSpecialTag, visibleInThisTag, usersInThisTag.Count(), otherUidsTaggedWithTag?.Count);
-        if (!isSpecialTag)
-        {
-            if (onlineUsers.Any() && onlineUsers.First() is DrawUserPair)
-            {
-                UiSharedService.DrawWithID($"group-{tag}-buttons", () => DrawButtons(tag, allUsers.Cast<DrawUserPair>().Where(p => otherUidsTaggedWithTag!.Contains(p.UID)).ToList()));
-            }
-        }
-
-        if (!_tagHandler.IsTagOpen(tag)) return;
-
-        ImGui.Indent(20);
-        DrawPairs(tag, usersInThisTag);
-        ImGui.Unindent(20);
-    }
-
-    private void DrawGroupMenu(string tag)
-    {
-        if (UiSharedService.IconTextButton(FontAwesomeIcon.Users, "Add people to " + tag))
-        {
-            _selectGroupForPairUi.Open(tag);
-        }
-        UiSharedService.AttachToolTip($"Add more users to Group {tag}");
-
-        if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete " + tag) && UiSharedService.CtrlPressed())
-        {
-            _tagHandler.RemoveTag(tag);
-        }
-        UiSharedService.AttachToolTip($"Delete Group {tag} (Will not delete the pairs)" + Environment.NewLine + "Hold CTRL to delete");
-    }
-
-    private void DrawName(string tag, bool isSpecialTag, int visible, int online, int? total)
-    {
-        string displayedName = tag switch
-        {
-            TagHandler.CustomUnpairedTag => "Unpaired",
-            TagHandler.CustomOfflineTag => "Offline",
-            TagHandler.CustomOnlineTag => _mareConfig.Current.ShowOfflineUsersSeparately ? "Online/Paused" : "Contacts",
-            TagHandler.CustomVisibleTag => "Visible",
-            _ => tag
-        };
-
-        string resultFolderName = !isSpecialTag ? $"{displayedName} ({visible}/{online}/{total} Pairs)" : $"{displayedName} ({online} Pairs)";
-
-        //  FontAwesomeIcon.CaretSquareDown : FontAwesomeIcon.CaretSquareRight
-        var icon = _tagHandler.IsTagOpen(tag) ? FontAwesomeIcon.CaretSquareDown : FontAwesomeIcon.CaretSquareRight;
-        UiSharedService.FontText(icon.ToIconString(), UiBuilder.IconFont);
-        if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
-        {
-            ToggleTagOpen(tag);
-        }
-        ImGui.SameLine();
-        UiSharedService.FontText(resultFolderName, UiBuilder.DefaultFont);
-        if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
-        {
-            ToggleTagOpen(tag);
-        }
-
-        if (!isSpecialTag && ImGui.IsItemHovered())
-        {
-            ImGui.BeginTooltip();
-            ImGui.TextUnformatted($"Group {tag}");
-            ImGui.Separator();
-            ImGui.TextUnformatted($"{visible} Pairs visible");
-            ImGui.TextUnformatted($"{online} Pairs online/paused");
-            ImGui.TextUnformatted($"{total} Pairs total");
-            ImGui.EndTooltip();
-        }
-    }
-
-    private void DrawPairs(string tag, IEnumerable<DrawPairBase> availablePairsInThisCategory)
-    {
-        // These are all the OtherUIDs that are tagged with this tag
-        foreach (var pair in availablePairsInThisCategory)
-        {
-            UiSharedService.DrawWithID($"tag-{tag}-pair-${pair.UID}", () => pair.DrawPairedClient());
-        }
-        ImGui.Separator();
-    }
-
-    private void DrawUserPairs(List<string> tagsWithPairsInThem, List<DrawUserPair> allUsers, IEnumerable<DrawUserPair> visibleUsers, IEnumerable<DrawUserPair> onlineUsers, IEnumerable<DrawUserPair> offlineUsers)
-    {
-        if (_mareConfig.Current.ShowVisibleUsersSeparately)
-        {
-            UiSharedService.DrawWithID("$group-VisibleCustomTag", () => DrawCategory(TagHandler.CustomVisibleTag, visibleUsers, allUsers));
-        }
-        foreach (var tag in tagsWithPairsInThem)
-        {
-            if (_mareConfig.Current.ShowOfflineUsersSeparately)
-            {
-                UiSharedService.DrawWithID($"group-{tag}", () => DrawCategory(tag, onlineUsers, allUsers, visibleUsers));
-            }
-            else
-            {
-                UiSharedService.DrawWithID($"group-{tag}", () => DrawCategory(tag, onlineUsers.Concat(offlineUsers).ToList(), allUsers, visibleUsers));
-            }
-        }
-        if (_mareConfig.Current.ShowOfflineUsersSeparately)
-        {
-            UiSharedService.DrawWithID($"group-OnlineCustomTag", () => DrawCategory(TagHandler.CustomOnlineTag,
-                onlineUsers.Where(u => !_tagHandler.HasAnyTag(u.UID)).ToList(), allUsers));
-            UiSharedService.DrawWithID($"group-OfflineCustomTag", () => DrawCategory(TagHandler.CustomOfflineTag,
-                offlineUsers.Where(u => u.UserPair!.OtherPermissions.IsPaired()).ToList(), allUsers));
-        }
-        else
-        {
-            UiSharedService.DrawWithID($"group-OnlineCustomTag", () => DrawCategory(TagHandler.CustomOnlineTag,
-                onlineUsers.Concat(offlineUsers).Where(u => u.UserPair!.OtherPermissions.IsPaired() && !_tagHandler.HasAnyTag(u.UID)).ToList(), allUsers));
-        }
-        UiSharedService.DrawWithID($"group-UnpairedCustomTag", () => DrawCategory(TagHandler.CustomUnpairedTag,
-            offlineUsers.Where(u => !u.UserPair!.OtherPermissions.IsPaired()).ToList(), allUsers));
-    }
-
-    private void PauseRemainingPairs(List<DrawUserPair> availablePairs)
-    {
-        foreach (var pairToPause in availablePairs.Where(pair => !pair.UserPair!.OwnPermissions.IsPaused()))
-        {
-            var perm = pairToPause.UserPair!.OwnPermissions;
-            perm.SetPaused(paused: true);
-            _ = _apiController.UserSetPairPermissions(new(new(pairToPause.UID), perm));
-        }
-    }
-
-    private void ResumeAllPairs(List<DrawUserPair> availablePairs)
-    {
-        foreach (var pairToPause in availablePairs)
-        {
-            var perm = pairToPause.UserPair!.OwnPermissions;
-            perm.SetPaused(paused: false);
-            _ = _apiController.UserSetPairPermissions(new(new(pairToPause.UID), perm));
-        }
-    }
-
-    private void ToggleTagOpen(string tag)
-    {
-        bool open = !_tagHandler.IsTagOpen(tag);
-        _tagHandler.SetTagOpen(tag, open);
-    }
-}

MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs

@@ -0,0 +1,46 @@
+using Dalamud.Interface;
+using ImGuiNET;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using System.Numerics;
+
+namespace MareSynchronos.UI.Components.Popup;
+
+public class BanUserPopupHandler : IPopupHandler
+{
+    private readonly ApiController _apiController;
+    private string _banReason = string.Empty;
+    private GroupFullInfoDto _group = null!;
+    private Pair _reportedPair = null!;
+
+    public BanUserPopupHandler(ApiController apiController)
+    {
+        _apiController = apiController;
+    }
+
+    public Vector2 PopupSize => new(500, 250);
+
+    public void DrawContent()
+    {
+        UiSharedService.TextWrapped("User " + (_reportedPair.UserData.AliasOrUID) + " will be banned and removed from this Syncshell.");
+        ImGui.InputTextWithHint("##banreason", "Ban Reason", ref _banReason, 255);
+
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.UserSlash, "Ban User"))
+        {
+            ImGui.CloseCurrentPopup();
+            var reason = _banReason;
+            _ = _apiController.GroupBanUser(new GroupPairDto(_group.Group, _reportedPair.UserData), reason);
+            _banReason = string.Empty;
+        }
+        UiSharedService.TextWrapped("The reason will be displayed in the banlist. The current server-side alias if present (Vanity ID) will automatically be attached to the reason.");
+    }
+
+    public void Open(OpenBanUserPopupMessage message)
+    {
+        _reportedPair = message.PairToBan;
+        _group = message.GroupFullInfoDto;
+        _banReason = string.Empty;
+    }
+}

MareSynchronos/UI/Components/Popup/CreateSyncshellPopupHandler.cs

@@ -0,0 +1,100 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Components;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.WebAPI;
+using System.Numerics;
+
+namespace MareSynchronos.UI.Components.Popup;
+
+public class CreateSyncshellPopupHandler : IPopupHandler
+{
+    private readonly ApiController _apiController;
+    private readonly UiSharedService _uiSharedService;
+    private bool _errorGroupCreate;
+    private GroupJoinDto? _lastCreatedGroup;
+
+    public CreateSyncshellPopupHandler(ApiController apiController, UiSharedService uiSharedService)
+    {
+        _apiController = apiController;
+        _uiSharedService = uiSharedService;
+    }
+
+    public Vector2 PopupSize => new(500, 300);
+
+    public void DrawContent()
+    {
+        using (ImRaii.PushFont(_uiSharedService.UidFont))
+            ImGui.TextUnformatted("Create new Syncshell");
+
+        if (_lastCreatedGroup == null)
+        {
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Plus, "Create Syncshell"))
+            {
+                try
+                {
+                    _lastCreatedGroup = _apiController.GroupCreate().Result;
+                }
+                catch
+                {
+                    _lastCreatedGroup = null;
+                    _errorGroupCreate = true;
+                }
+            }
+            ImGui.SameLine();
+        }
+
+        ImGui.Separator();
+
+        if (_lastCreatedGroup == null)
+        {
+            UiSharedService.TextWrapped("Creating a new Syncshell with create it defaulting to your current preferred permissions for Syncshells." + Environment.NewLine +
+                "- You can own up to " + _apiController.ServerInfo.MaxGroupsCreatedByUser + " Syncshells on this server." + Environment.NewLine +
+                "- You can join up to " + _apiController.ServerInfo.MaxGroupsJoinedByUser + " Syncshells on this server (including your own)" + Environment.NewLine +
+                "- Syncshells on this server can have a maximum of " + _apiController.ServerInfo.MaxGroupUserCount + " users");
+            ImGui.Dummy(new(2f));
+            ImGui.TextUnformatted("Your current Syncshell preferred permissions are:");
+            ImGui.TextUnformatted("- Animations");
+            UiSharedService.BooleanToColoredIcon(!_apiController.DefaultPermissions!.DisableGroupAnimations);
+            ImGui.TextUnformatted("- Sounds");
+            UiSharedService.BooleanToColoredIcon(!_apiController.DefaultPermissions!.DisableGroupSounds);
+            ImGui.TextUnformatted("- VFX");
+            UiSharedService.BooleanToColoredIcon(!_apiController.DefaultPermissions!.DisableGroupVFX);
+            UiSharedService.TextWrapped("(Those preferred permissions can be changed anytime after Syncshell creation, your defaults can be changed anytime in the Mare Settings)");
+        }
+        else
+        {
+            _errorGroupCreate = false;
+            ImGui.TextUnformatted("Syncshell ID: " + _lastCreatedGroup.Group.GID);
+            ImGui.AlignTextToFramePadding();
+            ImGui.TextUnformatted("Syncshell Password: " + _lastCreatedGroup.Password);
+            ImGui.SameLine();
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Copy))
+            {
+                ImGui.SetClipboardText(_lastCreatedGroup.Password);
+            }
+            UiSharedService.TextWrapped("You can change the Syncshell password later at any time.");
+            ImGui.Separator();
+            UiSharedService.TextWrapped("These settings were set based on your preferred syncshell permissions:");
+            ImGui.Dummy(new(2f));
+            UiSharedService.TextWrapped("Suggest Animation sync:");
+            UiSharedService.BooleanToColoredIcon(!_lastCreatedGroup.GroupUserPreferredPermissions.IsDisableAnimations());
+            UiSharedService.TextWrapped("Suggest Sounds sync:");
+            UiSharedService.BooleanToColoredIcon(!_lastCreatedGroup.GroupUserPreferredPermissions.IsDisableSounds());
+            UiSharedService.TextWrapped("Suggest VFX sync:");
+            UiSharedService.BooleanToColoredIcon(!_lastCreatedGroup.GroupUserPreferredPermissions.IsDisableVFX());
+        }
+
+        if (_errorGroupCreate)
+        {
+            UiSharedService.ColorTextWrapped("Something went wrong during creation of a new Syncshell", new Vector4(1, 0, 0, 1));
+        }
+    }
+
+    public void Open()
+    {
+        _lastCreatedGroup = null;
+    }
+}

MareSynchronos/UI/Components/Popup/IPopupHandler.cs

@@ -0,0 +1,10 @@
+using System.Numerics;
+
+namespace MareSynchronos.UI.Components.Popup;
+
+public interface IPopupHandler
+{
+    Vector2 PopupSize { get; }
+
+    void DrawContent();
+}

MareSynchronos/UI/Components/Popup/JoinSyncshellPopupHandler.cs

@@ -0,0 +1,163 @@
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.API.Data.Enum;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.API.Dto;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.Utils;
+using MareSynchronos.WebAPI;
+using System.Numerics;
+
+namespace MareSynchronos.UI.Components.Popup;
+
+internal class JoinSyncshellPopupHandler : IPopupHandler
+{
+    private readonly ApiController _apiController;
+    private readonly UiSharedService _uiSharedService;
+    private string _desiredSyncshellToJoin = string.Empty;
+    private GroupJoinInfoDto? _groupJoinInfo = null;
+    private DefaultPermissionsDto _ownPermissions = null!;
+    private string _previousPassword = string.Empty;
+    private string _syncshellPassword = string.Empty;
+
+    public JoinSyncshellPopupHandler(UiSharedService uiSharedService, ApiController apiController)
+    {
+        _uiSharedService = uiSharedService;
+        _apiController = apiController;
+    }
+
+    public Vector2 PopupSize => new(700, 400);
+
+    public void DrawContent()
+    {
+        using (ImRaii.PushFont(_uiSharedService.UidFont))
+            ImGui.TextUnformatted((_groupJoinInfo == null || !_groupJoinInfo.Success) ? "Join Syncshell" : ("Finalize join Syncshell " + _groupJoinInfo.GroupAliasOrGID));
+        ImGui.Separator();
+
+        if (_groupJoinInfo == null || !_groupJoinInfo.Success)
+        {
+            UiSharedService.TextWrapped("Here you can join existing Syncshells. " +
+                "Please keep in mind that you cannot join more than " + _apiController.ServerInfo.MaxGroupsJoinedByUser + " syncshells on this server." + Environment.NewLine +
+                "Joining a Syncshell will pair you implicitly with all existing users in the Syncshell." + Environment.NewLine +
+                "All permissions to all users in the Syncshell will be set to the preferred Syncshell permissions on joining, excluding prior set preferred permissions.");
+            ImGui.Separator();
+            ImGui.TextUnformatted("Note: Syncshell ID and Password are case sensitive. MSS- is part of Syncshell IDs, unless using Vanity IDs.");
+
+            ImGui.AlignTextToFramePadding();
+            ImGui.TextUnformatted("Syncshell ID");
+            ImGui.SameLine(200);
+            ImGui.InputTextWithHint("##syncshellId", "Full Syncshell ID", ref _desiredSyncshellToJoin, 20);
+
+            ImGui.AlignTextToFramePadding();
+            ImGui.TextUnformatted("Syncshell Password");
+            ImGui.SameLine(200);
+            ImGui.InputTextWithHint("##syncshellpw", "Password", ref _syncshellPassword, 20, ImGuiInputTextFlags.Password);
+            using (ImRaii.Disabled(string.IsNullOrEmpty(_desiredSyncshellToJoin) || string.IsNullOrEmpty(_syncshellPassword)))
+            {
+                if (UiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Plus, "Join Syncshell"))
+                {
+                    _groupJoinInfo = _apiController.GroupJoin(new GroupPasswordDto(new API.Data.GroupData(_desiredSyncshellToJoin), _syncshellPassword)).Result;
+                    _previousPassword = _syncshellPassword;
+                    _syncshellPassword = string.Empty;
+                }
+            }
+            if (_groupJoinInfo != null && !_groupJoinInfo.Success)
+            {
+                UiSharedService.ColorTextWrapped("Failed to join the Syncshell. This is due to one of following reasons:" + Environment.NewLine +
+                    "- The Syncshell does not exist or the password is incorrect" + Environment.NewLine +
+                    "- You are already in that Syncshell or are banned from that Syncshell" + Environment.NewLine +
+                    "- The Syncshell is at capacity or has invites disabled" + Environment.NewLine, ImGuiColors.DalamudYellow);
+            }
+        }
+        else
+        {
+            ImGui.TextUnformatted("You are about to join the Syncshell " + _groupJoinInfo.GroupAliasOrGID + " by " + _groupJoinInfo.OwnerAliasOrUID);
+            ImGui.Dummy(new(2));
+            ImGui.TextUnformatted("This Syncshell staff has set the following suggested Syncshell permissions:");
+            ImGui.TextUnformatted("- Sounds ");
+            UiSharedService.BooleanToColoredIcon(!_groupJoinInfo.GroupPermissions.IsPreferDisableSounds());
+            ImGui.TextUnformatted("- Animations");
+            UiSharedService.BooleanToColoredIcon(!_groupJoinInfo.GroupPermissions.IsPreferDisableAnimations());
+            ImGui.TextUnformatted("- VFX");
+            UiSharedService.BooleanToColoredIcon(!_groupJoinInfo.GroupPermissions.IsPreferDisableVFX());
+
+            if (_groupJoinInfo.GroupPermissions.IsPreferDisableSounds() != _ownPermissions.DisableGroupSounds
+                || _groupJoinInfo.GroupPermissions.IsPreferDisableVFX() != _ownPermissions.DisableGroupVFX
+                || _groupJoinInfo.GroupPermissions.IsPreferDisableAnimations() != _ownPermissions.DisableGroupAnimations)
+            {
+                ImGui.Dummy(new(2));
+                UiSharedService.ColorText("Your current preferred default Syncshell permissions deviate from the suggested permissions:", ImGuiColors.DalamudYellow);
+                if (_groupJoinInfo.GroupPermissions.IsPreferDisableSounds() != _ownPermissions.DisableGroupSounds)
+                {
+                    ImGui.AlignTextToFramePadding();
+                    ImGui.TextUnformatted("- Sounds");
+                    UiSharedService.BooleanToColoredIcon(!_ownPermissions.DisableGroupSounds);
+                    ImGui.SameLine(200);
+                    ImGui.TextUnformatted("Suggested");
+                    UiSharedService.BooleanToColoredIcon(!_groupJoinInfo.GroupPermissions.IsPreferDisableSounds());
+                    ImGui.SameLine();
+                    using var id = ImRaii.PushId("suggestedSounds");
+                    if (UiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.ArrowRight, "Apply suggested"))
+                    {
+                        _ownPermissions.DisableGroupSounds = _groupJoinInfo.GroupPermissions.IsPreferDisableSounds();
+                    }
+                }
+                if (_groupJoinInfo.GroupPermissions.IsPreferDisableAnimations() != _ownPermissions.DisableGroupAnimations)
+                {
+                    ImGui.AlignTextToFramePadding();
+                    ImGui.TextUnformatted("- Animations");
+                    UiSharedService.BooleanToColoredIcon(!_ownPermissions.DisableGroupAnimations);
+                    ImGui.SameLine(200);
+                    ImGui.TextUnformatted("Suggested");
+                    UiSharedService.BooleanToColoredIcon(!_groupJoinInfo.GroupPermissions.IsPreferDisableAnimations());
+                    ImGui.SameLine();
+                    using var id = ImRaii.PushId("suggestedAnims");
+                    if (UiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.ArrowRight, "Apply suggested"))
+                    {
+                        _ownPermissions.DisableGroupAnimations = _groupJoinInfo.GroupPermissions.IsPreferDisableAnimations();
+                    }
+                }
+                if (_groupJoinInfo.GroupPermissions.IsPreferDisableVFX() != _ownPermissions.DisableGroupVFX)
+                {
+                    ImGui.AlignTextToFramePadding();
+                    ImGui.TextUnformatted("- VFX");
+                    UiSharedService.BooleanToColoredIcon(!_ownPermissions.DisableGroupVFX);
+                    ImGui.SameLine(200);
+                    ImGui.TextUnformatted("Suggested");
+                    UiSharedService.BooleanToColoredIcon(!_groupJoinInfo.GroupPermissions.IsPreferDisableVFX());
+                    ImGui.SameLine();
+                    using var id = ImRaii.PushId("suggestedVfx");
+                    if (UiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.ArrowRight, "Apply suggested"))
+                    {
+                        _ownPermissions.DisableGroupVFX = _groupJoinInfo.GroupPermissions.IsPreferDisableVFX();
+                    }
+                }
+                UiSharedService.TextWrapped("Note: you do not need to apply the suggested Syncshell permissions, they are solely suggestions by the staff of the Syncshell.");
+            }
+            else
+            {
+                UiSharedService.TextWrapped("Your default syncshell permissions on joining are in line with the suggested Syncshell permissions through the owner.");
+            }
+            ImGui.Dummy(new(2));
+            if (UiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Plus, "Finalize and join " + _groupJoinInfo.GroupAliasOrGID))
+            {
+                GroupUserPreferredPermissions joinPermissions = GroupUserPreferredPermissions.NoneSet;
+                joinPermissions.SetDisableSounds(_ownPermissions.DisableGroupSounds);
+                joinPermissions.SetDisableAnimations(_ownPermissions.DisableGroupAnimations);
+                joinPermissions.SetDisableVFX(_ownPermissions.DisableGroupVFX);
+                _ = _apiController.GroupJoinFinalize(new GroupJoinDto(_groupJoinInfo.Group, _previousPassword, joinPermissions));
+                ImGui.CloseCurrentPopup();
+            }
+        }
+    }
+
+    public void Open()
+    {
+        _desiredSyncshellToJoin = string.Empty;
+        _syncshellPassword = string.Empty;
+        _previousPassword = string.Empty;
+        _groupJoinInfo = null;
+        _ownPermissions = _apiController.DefaultPermissions.DeepClone()!;
+    }
+}

MareSynchronos/UI/Components/Popup/PopupHandler.cs

@@ -0,0 +1,95 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.Services.Mediator;
+using Microsoft.Extensions.Logging;
+using System.Numerics;
+
+namespace MareSynchronos.UI.Components.Popup;
+
+public class PopupHandler : WindowMediatorSubscriberBase
+{
+    protected bool _openPopup = false;
+    private readonly HashSet<IPopupHandler> _handlers;
+    private IPopupHandler? _currentHandler = null;
+
+    public PopupHandler(ILogger<PopupHandler> logger, MareMediator mediator, IEnumerable<IPopupHandler> popupHandlers)
+        : base(logger, mediator, "MarePopupHandler")
+    {
+        Flags = ImGuiWindowFlags.NoBringToFrontOnFocus
+          | ImGuiWindowFlags.NoDecoration
+          | ImGuiWindowFlags.NoInputs
+          | ImGuiWindowFlags.NoSavedSettings
+          | ImGuiWindowFlags.NoBackground
+          | ImGuiWindowFlags.NoMove
+          | ImGuiWindowFlags.NoNav
+          | ImGuiWindowFlags.NoTitleBar;
+        IsOpen = true;
+
+        _handlers = popupHandlers.ToHashSet();
+
+        Mediator.Subscribe<OpenReportPopupMessage>(this, (msg) =>
+        {
+            _openPopup = true;
+            _currentHandler = _handlers.OfType<ReportPopupHandler>().Single();
+            ((ReportPopupHandler)_currentHandler).Open(msg);
+            IsOpen = true;
+        });
+
+        Mediator.Subscribe<OpenCreateSyncshellPopupMessage>(this, (msg) =>
+        {
+            _openPopup = true;
+            _currentHandler = _handlers.OfType<CreateSyncshellPopupHandler>().Single();
+            ((CreateSyncshellPopupHandler)_currentHandler).Open();
+            IsOpen = true;
+        });
+
+        Mediator.Subscribe<OpenBanUserPopupMessage>(this, (msg) =>
+        {
+            _openPopup = true;
+            _currentHandler = _handlers.OfType<BanUserPopupHandler>().Single();
+            ((BanUserPopupHandler)_currentHandler).Open(msg);
+            IsOpen = true;
+        });
+
+        Mediator.Subscribe<JoinSyncshellPopupMessage>(this, (_) =>
+        {
+            _openPopup = true;
+            _currentHandler = _handlers.OfType<JoinSyncshellPopupHandler>().Single();
+            ((JoinSyncshellPopupHandler)_currentHandler).Open();
+            IsOpen = true;
+        });
+
+        Mediator.Subscribe<OpenSyncshellAdminPanelPopupMessage>(this, (msg) =>
+        {
+            IsOpen = true;
+            _openPopup = true;
+            _currentHandler = _handlers.OfType<SyncshellAdminPopupHandler>().Single();
+            ((SyncshellAdminPopupHandler)_currentHandler).Open(msg.GroupInfo);
+            IsOpen = true;
+        });
+    }
+
+    public override void Draw()
+    {
+        if (_currentHandler == null) return;
+
+        if (_openPopup)
+        {
+            ImGui.OpenPopup(WindowName);
+            _openPopup = false;
+        }
+
+        var viewportSize = ImGui.GetWindowViewport().Size;
+        ImGui.SetNextWindowSize(_currentHandler!.PopupSize);
+        ImGui.SetNextWindowPos(viewportSize / 2, ImGuiCond.Always, new Vector2(0.5f));
+        using var popup = ImRaii.Popup(WindowName, ImGuiWindowFlags.Modal);
+        if (!popup) return;
+        _currentHandler.DrawContent();
+        ImGui.Separator();
+        if (UiSharedService.IconTextButton(FontAwesomeIcon.Times, "Close"))
+        {
+            ImGui.CloseCurrentPopup();
+        }
+    }
+}

MareSynchronos/UI/Components/Popup/ReportPopupHandler.cs

@@ -0,0 +1,57 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using System.Numerics;
+
+namespace MareSynchronos.UI.Components.Popup;
+
+internal class ReportPopupHandler : IPopupHandler
+{
+    private readonly ApiController _apiController;
+    private readonly UiSharedService _uiSharedService;
+    private Pair? _reportedPair;
+    private string _reportReason = string.Empty;
+
+    public ReportPopupHandler(ApiController apiController, UiSharedService uiSharedService)
+    {
+        _apiController = apiController;
+        _uiSharedService = uiSharedService;
+    }
+
+    public Vector2 PopupSize => new(500, 500);
+
+    public void DrawContent()
+    {
+        using (ImRaii.PushFont(_uiSharedService.UidFont))
+            UiSharedService.TextWrapped("Report " + _reportedPair!.UserData.AliasOrUID + " Mare Profile");
+
+        ImGui.InputTextMultiline("##reportReason", ref _reportReason, 500, new Vector2(500 - ImGui.GetStyle().ItemSpacing.X * 2, 200));
+        UiSharedService.TextWrapped($"Note: Sending a report will disable the offending profile globally.{Environment.NewLine}" +
+            $"The report will be sent to the team of your currently connected Mare Synchronos Service.{Environment.NewLine}" +
+            $"The report will include your user and your contact info (Discord User).{Environment.NewLine}" +
+            $"Depending on the severity of the offense the users Mare profile or account can be permanently disabled or banned.");
+        UiSharedService.ColorTextWrapped("Report spam and wrong reports will not be tolerated and can lead to permanent account suspension.", ImGuiColors.DalamudRed);
+        UiSharedService.ColorTextWrapped("This is not for reporting misbehavior or Mare usage but solely for the actual profile. " +
+            "Reports that are not solely for the profile will be ignored.", ImGuiColors.DalamudYellow);
+
+        using (ImRaii.Disabled(string.IsNullOrEmpty(_reportReason)))
+        {
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.ExclamationTriangle, "Send Report"))
+            {
+                ImGui.CloseCurrentPopup();
+                var reason = _reportReason;
+                _ = _apiController.UserReportProfile(new(_reportedPair.UserData, reason));
+            }
+        }
+    }
+
+    public void Open(OpenReportPopupMessage msg)
+    {
+        _reportedPair = msg.PairToReport;
+        _reportReason = string.Empty;
+    }
+}

MareSynchronos/UI/Components/Popup/SyncshellAdminPopupHandler.cs

@@ -0,0 +1,234 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility.Raii;
+using ImGuiNET;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.WebAPI;
+using System.Globalization;
+using System.Numerics;
+
+namespace MareSynchronos.UI.Components.Popup;
+
+internal class SyncshellAdminPopupHandler : IPopupHandler
+{
+    private readonly ApiController _apiController;
+    private readonly List<string> _oneTimeInvites = [];
+    private readonly PairManager _pairManager;
+    private readonly UiSharedService _uiSharedService;
+    private List<BannedGroupUserDto> _bannedUsers = [];
+    private GroupFullInfoDto _groupFullInfo = null!;
+    private bool _isModerator = false;
+    private bool _isOwner = false;
+    private int _multiInvites = 30;
+    private string _newPassword = string.Empty;
+    private bool _pwChangeSuccess = true;
+
+    public SyncshellAdminPopupHandler(ApiController apiController, UiSharedService uiSharedService, PairManager pairManager)
+    {
+        _apiController = apiController;
+        _uiSharedService = uiSharedService;
+        _pairManager = pairManager;
+    }
+
+    public Vector2 PopupSize => new(700, 500);
+
+    public void DrawContent()
+    {
+        if (!_isModerator && !_isOwner) return;
+
+        _groupFullInfo = _pairManager.Groups[_groupFullInfo.Group];
+
+        using (ImRaii.PushFont(_uiSharedService.UidFont))
+            ImGui.TextUnformatted(_groupFullInfo.GroupAliasOrGID + " Administrative Panel");
+
+        ImGui.Separator();
+        var perm = _groupFullInfo.GroupPermissions;
+
+        var inviteNode = ImRaii.TreeNode("Invites");
+        if (inviteNode)
+        {
+            bool isInvitesDisabled = perm.IsDisableInvites();
+
+            if (UiSharedService.IconTextButton(isInvitesDisabled ? FontAwesomeIcon.Unlock : FontAwesomeIcon.Lock,
+                isInvitesDisabled ? "Unlock Syncshell" : "Lock Syncshell"))
+            {
+                perm.SetDisableInvites(!isInvitesDisabled);
+                _ = _apiController.GroupChangeGroupPermissionState(new(_groupFullInfo.Group, perm));
+            }
+
+            ImGui.Dummy(new(2f));
+
+            UiSharedService.TextWrapped("One-time invites work as single-use passwords. Use those if you do not want to distribute your Syncshell password.");
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Single one-time invite"))
+            {
+                ImGui.SetClipboardText(_apiController.GroupCreateTempInvite(new(_groupFullInfo.Group), 1).Result.FirstOrDefault() ?? string.Empty);
+            }
+            UiSharedService.AttachToolTip("Creates a single-use password for joining the syncshell which is valid for 24h and copies it to the clipboard.");
+            ImGui.InputInt("##amountofinvites", ref _multiInvites);
+            ImGui.SameLine();
+            using (ImRaii.Disabled(_multiInvites <= 1 || _multiInvites > 100))
+            {
+                if (UiSharedService.IconTextButton(FontAwesomeIcon.Envelope, "Generate " + _multiInvites + " one-time invites"))
+                {
+                    _oneTimeInvites.AddRange(_apiController.GroupCreateTempInvite(new(_groupFullInfo.Group), _multiInvites).Result);
+                }
+            }
+
+            if (_oneTimeInvites.Any())
+            {
+                var invites = string.Join(Environment.NewLine, _oneTimeInvites);
+                ImGui.InputTextMultiline("Generated Multi Invites", ref invites, 5000, new(0, 0), ImGuiInputTextFlags.ReadOnly);
+                if (UiSharedService.IconTextButton(FontAwesomeIcon.Copy, "Copy Invites to clipboard"))
+                {
+                    ImGui.SetClipboardText(invites);
+                }
+            }
+        }
+        inviteNode.Dispose();
+
+        var mgmtNode = ImRaii.TreeNode("User Management");
+        if (mgmtNode)
+        {
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Broom, "Clear Syncshell"))
+            {
+                _ = _apiController.GroupClear(new(_groupFullInfo.Group));
+            }
+            UiSharedService.AttachToolTip("This will remove all non-pinned, non-moderator users from the Syncshell");
+
+            ImGui.Dummy(new(2f));
+
+            if (UiSharedService.IconTextButton(FontAwesomeIcon.Retweet, "Refresh Banlist from Server"))
+            {
+                _bannedUsers = _apiController.GroupGetBannedUsers(new GroupDto(_groupFullInfo.Group)).Result;
+            }
+
+            if (ImGui.BeginTable("bannedusertable" + _groupFullInfo.GID, 6, ImGuiTableFlags.RowBg | ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.ScrollY))
+            {
+                ImGui.TableSetupColumn("UID", ImGuiTableColumnFlags.None, 1);
+                ImGui.TableSetupColumn("Alias", ImGuiTableColumnFlags.None, 1);
+                ImGui.TableSetupColumn("By", ImGuiTableColumnFlags.None, 1);
+                ImGui.TableSetupColumn("Date", ImGuiTableColumnFlags.None, 2);
+                ImGui.TableSetupColumn("Reason", ImGuiTableColumnFlags.None, 3);
+                ImGui.TableSetupColumn("Actions", ImGuiTableColumnFlags.None, 1);
+
+                ImGui.TableHeadersRow();
+
+                foreach (var bannedUser in _bannedUsers.ToList())
+                {
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted(bannedUser.UID);
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted(bannedUser.UserAlias ?? string.Empty);
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted(bannedUser.BannedBy);
+                    ImGui.TableNextColumn();
+                    ImGui.TextUnformatted(bannedUser.BannedOn.ToLocalTime().ToString(CultureInfo.CurrentCulture));
+                    ImGui.TableNextColumn();
+                    UiSharedService.TextWrapped(bannedUser.Reason);
+                    ImGui.TableNextColumn();
+                    if (UiSharedService.IconTextButton(FontAwesomeIcon.Check, "Unban#" + bannedUser.UID))
+                    {
+                        _ = _apiController.GroupUnbanUser(bannedUser);
+                        _bannedUsers.RemoveAll(b => string.Equals(b.UID, bannedUser.UID, StringComparison.Ordinal));
+                    }
+                }
+
+                ImGui.EndTable();
+            }
+        }
+        mgmtNode.Dispose();
+
+        var permNode = ImRaii.TreeNode("Permissions");
+        if (permNode)
+        {
+            bool isDisableAnimations = perm.IsPreferDisableAnimations();
+            bool isDisableSounds = perm.IsPreferDisableSounds();
+            bool isDisableVfx = perm.IsPreferDisableVFX();
+
+            ImGui.AlignTextToFramePadding();
+            ImGui.Text("Suggest Sound Sync");
+            UiSharedService.BooleanToColoredIcon(!isDisableSounds);
+            ImGui.SameLine(230);
+            if (UiSharedService.IconTextButton(isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute,
+                isDisableSounds ? "Suggest to enable sound sync" : "Suggest to disable sound sync"))
+            {
+                perm.SetPreferDisableSounds(!perm.IsPreferDisableSounds());
+                _ = _apiController.GroupChangeGroupPermissionState(new(_groupFullInfo.Group, perm));
+            }
+
+            ImGui.AlignTextToFramePadding();
+            ImGui.Text("Suggest Animation Sync");
+            UiSharedService.BooleanToColoredIcon(!isDisableAnimations);
+            ImGui.SameLine(230);
+            if (UiSharedService.IconTextButton(isDisableAnimations ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop,
+                isDisableAnimations ? "Suggest to enable animation sync" : "Suggest to disable animation sync"))
+            {
+                perm.SetPreferDisableAnimations(!perm.IsPreferDisableAnimations());
+                _ = _apiController.GroupChangeGroupPermissionState(new(_groupFullInfo.Group, perm));
+            }
+
+            ImGui.AlignTextToFramePadding();
+            ImGui.Text("Suggest VFX Sync");
+            UiSharedService.BooleanToColoredIcon(!isDisableVfx);
+            ImGui.SameLine(230);
+            if (UiSharedService.IconTextButton(isDisableVfx ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle,
+                isDisableVfx ? "Suggest to enable vfx sync" : "Suggest to disable vfx sync"))
+            {
+                perm.SetPreferDisableVFX(!perm.IsPreferDisableVFX());
+                _ = _apiController.GroupChangeGroupPermissionState(new(_groupFullInfo.Group, perm));
+            }
+
+            UiSharedService.TextWrapped("Note: those suggested permissions will be shown to users on joining the Syncshell.");
+        }
+        permNode.Dispose();
+
+        if (_isOwner)
+        {
+            var ownerNode = ImRaii.TreeNode("Owner Settings");
+            if (ownerNode)
+            {
+                ImGui.AlignTextToFramePadding();
+                ImGui.TextUnformatted("New Password");
+                ImGui.SameLine();
+                ImGui.InputTextWithHint("##changepw", "Min 10 characters", ref _newPassword, 50);
+                ImGui.SameLine();
+                using (ImRaii.Disabled(_newPassword.Length < 10))
+                {
+                    if (UiSharedService.IconTextButton(FontAwesomeIcon.Passport, "Change Password"))
+                    {
+                        _pwChangeSuccess = _apiController.GroupChangePassword(new GroupPasswordDto(_groupFullInfo.Group, _newPassword)).Result;
+                        _newPassword = string.Empty;
+                    }
+                }
+                UiSharedService.AttachToolTip("Password requires to be at least 10 characters long. This action is irreversible.");
+
+                if (!_pwChangeSuccess)
+                {
+                    UiSharedService.ColorTextWrapped("Failed to change the password. Password requires to be at least 10 characters long.", ImGuiColors.DalamudYellow);
+                }
+
+                if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Syncshell") && UiSharedService.CtrlPressed() && UiSharedService.ShiftPressed())
+                {
+                    ImGui.CloseCurrentPopup();
+                    _ = _apiController.GroupDelete(new(_groupFullInfo.Group));
+                }
+                UiSharedService.AttachToolTip("Hold CTRL and Shift and click to delete this Syncshell." + Environment.NewLine + "WARNING: this action is irreversible.");
+            }
+            ownerNode.Dispose();
+        }
+    }
+
+    public void Open(GroupFullInfoDto groupFullInfo)
+    {
+        _groupFullInfo = groupFullInfo;
+        _isOwner = string.Equals(_groupFullInfo.OwnerUID, _apiController.UID, StringComparison.Ordinal);
+        _isModerator = _groupFullInfo.GroupUserInfo.IsModerator();
+        _newPassword = string.Empty;
+        _bannedUsers.Clear();
+        _oneTimeInvites.Clear();
+        _multiInvites = 30;
+        _pwChangeSuccess = true;
+    }
+}

MareSynchronos/UI/Components/SelectPairForTagUi.cs

@@ -1,23 +1,24 @@
-using System.Numerics;
+using Dalamud.Interface;
-using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using ImGuiNET;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.UI.Handlers;
 
+using System.Numerics;
+
 namespace MareSynchronos.UI.Components;
 
-public class SelectPairForGroupUi
+public class SelectPairForTagUi
 {
     private readonly TagHandler _tagHandler;
-    private readonly UidDisplayHandler _uidDisplayHandler;
+    private readonly IdDisplayHandler _uidDisplayHandler;
     private string _filter = string.Empty;
     private bool _opened = false;
     private HashSet<string> _peopleInGroup = new(StringComparer.Ordinal);
     private bool _show = false;
     private string _tag = string.Empty;
 
-    public SelectPairForGroupUi(TagHandler tagHandler, UidDisplayHandler uidDisplayHandler)
+    public SelectPairForTagUi(TagHandler tagHandler, IdDisplayHandler uidDisplayHandler)
     {
         _tagHandler = tagHandler;
         _uidDisplayHandler = uidDisplayHandler;

MareSynchronos/UI/Components/SelectTagForPairUi.cs

@@ -1,5 +1,4 @@
-using System.Numerics;
+using Dalamud.Interface;
-using Dalamud.Interface;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility;
 using Dalamud.Utility;
@@ -7,12 +6,14 @@ using ImGuiNET;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.UI.Handlers;
 
+using System.Numerics;
+
 namespace MareSynchronos.UI.Components;
 
-public class SelectGroupForPairUi
+public class SelectTagForPairUi
 {
     private readonly TagHandler _tagHandler;
-    private readonly UidDisplayHandler _uidDisplayHandler;
+    private readonly IdDisplayHandler _uidDisplayHandler;
 
     /// <summary>
     /// The group UI is always open for a specific pair. This defines which pair the UI is open for.
@@ -30,7 +31,7 @@ public class SelectGroupForPairUi
     /// </summary>
     private string _tagNameToAdd = "";
 
-    public SelectGroupForPairUi(TagHandler tagHandler, UidDisplayHandler uidDisplayHandler)
+    public SelectTagForPairUi(TagHandler tagHandler, IdDisplayHandler uidDisplayHandler)
     {
         _show = false;
         _pair = null;

MareSynchronos/UI/DataAnalysisUi.cs

@@ -15,20 +15,20 @@ namespace MareSynchronos.UI;
 public class DataAnalysisUi : WindowMediatorSubscriberBase
 {
     private readonly CharacterAnalyzer _characterAnalyzer;
-    private readonly IpcManager _ipcManager;
-    private bool _hasUpdate = false;
-    private Dictionary<ObjectKind, Dictionary<string, CharacterAnalyzer.FileDataEntry>>? _cachedAnalysis;
-    private string _selectedHash = string.Empty;
-    private ObjectKind _selectedObjectTab;
-    private string _selectedFileTypeTab = string.Empty;
-    private bool _enableBc7ConversionMode = false;
-    private readonly Dictionary<string, string[]> _texturesToConvert = new(StringComparer.Ordinal);
-    private Task? _conversionTask;
-    private CancellationTokenSource _conversionCancellationTokenSource = new();
     private readonly Progress<(string, int)> _conversionProgress = new();
+    private readonly IpcManager _ipcManager;
+    private readonly Dictionary<string, string[]> _texturesToConvert = new(StringComparer.Ordinal);
+    private Dictionary<ObjectKind, Dictionary<string, CharacterAnalyzer.FileDataEntry>>? _cachedAnalysis;
+    private CancellationTokenSource _conversionCancellationTokenSource = new();
     private string _conversionCurrentFileName = string.Empty;
     private int _conversionCurrentFileProgress = 0;
+    private Task? _conversionTask;
+    private bool _enableBc7ConversionMode = false;
+    private bool _hasUpdate = false;
     private bool _modalOpen = false;
+    private string _selectedFileTypeTab = string.Empty;
+    private string _selectedHash = string.Empty;
+    private ObjectKind _selectedObjectTab;
     private bool _showModal = false;
 
     public DataAnalysisUi(ILogger<DataAnalysisUi> logger, MareMediator mediator, CharacterAnalyzer characterAnalyzer, IpcManager ipcManager) : base(logger, mediator, "Mare Character Data Analysis")
@@ -57,26 +57,6 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         _conversionProgress.ProgressChanged += ConversionProgress_ProgressChanged;
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        _conversionProgress.ProgressChanged -= ConversionProgress_ProgressChanged;
-    }
-
-    private void ConversionProgress_ProgressChanged(object? sender, (string, int) e)
-    {
-        _conversionCurrentFileName = e.Item1;
-        _conversionCurrentFileProgress = e.Item2;
-    }
-
-    public override void OnOpen()
-    {
-        _hasUpdate = true;
-        _selectedHash = string.Empty;
-        _enableBc7ConversionMode = false;
-        _texturesToConvert.Clear();
-    }
-
     public override void Draw()
     {
         if (_conversionTask != null && !_conversionTask.IsCompleted)
@@ -84,7 +64,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
             _showModal = true;
             if (ImGui.BeginPopupModal("BC7 Conversion in Progress"))
             {
-                ImGui.Text("BC7 Conversion in progress: " + _conversionCurrentFileProgress + "/" + _texturesToConvert.Count);
+                ImGui.TextUnformatted("BC7 Conversion in progress: " + _conversionCurrentFileProgress + "/" + _texturesToConvert.Count);
                 UiSharedService.TextWrapped("Current file: " + _conversionCurrentFileName);
                 if (UiSharedService.IconTextButton(FontAwesomeIcon.StopCircle, "Cancel conversion"))
                 {
@@ -141,14 +121,14 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                     ImGuiColors.DalamudYellow);
                 if (UiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Start analysis (missing entries)"))
                 {
-                    _ = _characterAnalyzer.ComputeAnalysis(false);
+                    _ = _characterAnalyzer.ComputeAnalysis(print: false);
                 }
             }
             else
             {
                 if (UiSharedService.IconTextButton(FontAwesomeIcon.PlayCircle, "Start analysis (recalculate all entries)"))
                 {
-                    _ = _characterAnalyzer.ComputeAnalysis(false, true);
+                    _ = _characterAnalyzer.ComputeAnalysis(print: false, recalculate: true);
                 }
             }
         }
@@ -266,7 +246,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                     ImGui.SameLine();
                     ImGui.TextUnformatted(UiSharedService.ByteToString(fileGroup.Sum(c => c.CompressedSize)));
 
-                    if (_selectedFileTypeTab == "tex")
+                    if (string.Equals(_selectedFileTypeTab, "tex", StringComparison.Ordinal))
                     {
                         ImGui.Checkbox("Enable BC7 Conversion Mode", ref _enableBc7ConversionMode);
                         if (_enableBc7ConversionMode)
@@ -298,13 +278,13 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
 
         ImGui.Separator();
 
-        ImGui.Text("Selected file:");
+        ImGui.TextUnformatted("Selected file:");
         ImGui.SameLine();
         UiSharedService.ColorText(_selectedHash, ImGuiColors.DalamudYellow);
 
-        if (_cachedAnalysis[_selectedObjectTab].ContainsKey(_selectedHash))
+        if (_cachedAnalysis[_selectedObjectTab].TryGetValue(_selectedHash, out CharacterAnalyzer.FileDataEntry? item))
         {
-            var filePaths = _cachedAnalysis[_selectedObjectTab][_selectedHash].FilePaths;
+            var filePaths = item.FilePaths;
             ImGui.TextUnformatted("Local file path:");
             ImGui.SameLine();
             UiSharedService.TextWrapped(filePaths[0]);
@@ -317,7 +297,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                 UiSharedService.AttachToolTip(string.Join(Environment.NewLine, filePaths.Skip(1)));
             }
 
-            var gamepaths = _cachedAnalysis[_selectedObjectTab][_selectedHash].GamePaths;
+            var gamepaths = item.GamePaths;
             ImGui.TextUnformatted("Used by game path:");
             ImGui.SameLine();
             UiSharedService.TextWrapped(gamepaths[0]);
@@ -332,17 +312,38 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
         }
     }
 
+    public override void OnOpen()
+    {
+        _hasUpdate = true;
+        _selectedHash = string.Empty;
+        _enableBc7ConversionMode = false;
+        _texturesToConvert.Clear();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        _conversionProgress.ProgressChanged -= ConversionProgress_ProgressChanged;
+    }
+
+    private void ConversionProgress_ProgressChanged(object? sender, (string, int) e)
+    {
+        _conversionCurrentFileName = e.Item1;
+        _conversionCurrentFileProgress = e.Item2;
+    }
+
     private void DrawTable(IGrouping<string, CharacterAnalyzer.FileDataEntry> fileGroup)
     {
-        using var table = ImRaii.Table("Analysis", fileGroup.Key == "tex" ? (_enableBc7ConversionMode ? 7 : 6) : 5, ImGuiTableFlags.Sortable | ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY | ImGuiTableFlags.SizingFixedFit,
+        using var table = ImRaii.Table("Analysis", string.Equals(fileGroup.Key, "tex", StringComparison.Ordinal) ? 
-new Vector2(0, 300));
+            (_enableBc7ConversionMode ? 7 : 6) : 5, ImGuiTableFlags.Sortable | ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY | ImGuiTableFlags.SizingFixedFit,
+            new Vector2(0, 300));
         if (!table.Success) return;
         ImGui.TableSetupColumn("Hash");
         ImGui.TableSetupColumn("Filepaths");
         ImGui.TableSetupColumn("Gamepaths");
         ImGui.TableSetupColumn("Original Size");
         ImGui.TableSetupColumn("Compressed Size");
-        if (fileGroup.Key == "tex")
+        if (string.Equals(fileGroup.Key, "tex", StringComparison.Ordinal))
         {
             ImGui.TableSetupColumn("Format");
             if (_enableBc7ConversionMode) ImGui.TableSetupColumn("Convert to BC7");
@@ -375,9 +376,9 @@ new Vector2(0, 300));
                 _cachedAnalysis![_selectedObjectTab] = _cachedAnalysis[_selectedObjectTab].OrderBy(k => k.Value.CompressedSize).ToDictionary(d => d.Key, d => d.Value, StringComparer.Ordinal);
             if (idx == 4 && sortSpecs.Specs.SortDirection == ImGuiSortDirection.Descending)
                 _cachedAnalysis![_selectedObjectTab] = _cachedAnalysis[_selectedObjectTab].OrderByDescending(k => k.Value.CompressedSize).ToDictionary(d => d.Key, d => d.Value, StringComparer.Ordinal);
-            if (fileGroup.Key == "tex" && idx == 5 && sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending)
+            if (string.Equals(fileGroup.Key, "tex", StringComparison.Ordinal) && idx == 5 && sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending)
                 _cachedAnalysis![_selectedObjectTab] = _cachedAnalysis[_selectedObjectTab].OrderBy(k => k.Value.Format).ToDictionary(d => d.Key, d => d.Value, StringComparer.Ordinal);
-            if (fileGroup.Key == "tex" && idx == 5 && sortSpecs.Specs.SortDirection == ImGuiSortDirection.Descending)
+            if (string.Equals(fileGroup.Key, "tex", StringComparison.Ordinal) && idx == 5 && sortSpecs.Specs.SortDirection == ImGuiSortDirection.Descending)
                 _cachedAnalysis![_selectedObjectTab] = _cachedAnalysis[_selectedObjectTab].OrderByDescending(k => k.Value.Format).ToDictionary(d => d.Key, d => d.Value, StringComparer.Ordinal);
 
             sortSpecs.SpecsDirty = false;
@@ -385,7 +386,7 @@ new Vector2(0, 300));
 
         foreach (var item in fileGroup)
         {
-            using var text = ImRaii.PushColor(ImGuiCol.Text, new Vector4(0, 0, 0, 1), string.Equals(item.Hash, _selectedHash));
+            using var text = ImRaii.PushColor(ImGuiCol.Text, new Vector4(0, 0, 0, 1), string.Equals(item.Hash, _selectedHash, StringComparison.Ordinal));
             using var text2 = ImRaii.PushColor(ImGuiCol.Text, new Vector4(1, 1, 1, 1), !item.IsComputed);
             ImGui.TableNextColumn();
             if (!item.IsComputed)
@@ -412,7 +413,7 @@ new Vector2(0, 300));
             ImGui.TableNextColumn();
             ImGui.TextUnformatted(UiSharedService.ByteToString(item.CompressedSize));
             if (ImGui.IsItemClicked()) _selectedHash = item.Hash;
-            if (fileGroup.Key == "tex")
+            if (string.Equals(fileGroup.Key, "tex", StringComparison.Ordinal))
             {
                 ImGui.TableNextColumn();
                 ImGui.TextUnformatted(item.Format.Value);
@@ -420,9 +421,9 @@ new Vector2(0, 300));
                 if (_enableBc7ConversionMode)
                 {
                     ImGui.TableNextColumn();
-                    if (item.Format.Value == "BC7")
+                    if (string.Equals(item.Format.Value, "BC7", StringComparison.Ordinal))
                     {
-                        ImGui.Text("");
+                        ImGui.TextUnformatted("");
                         continue;
                     }
                     var filePath = item.FilePaths[0];
@@ -442,4 +443,4 @@ new Vector2(0, 300));
             }
         }
     }
-}
+}

MareSynchronos/UI/DrawEntityFactory.cs

@@ -0,0 +1,61 @@
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.Services.ServerConfiguration;
+using MareSynchronos.UI.Components;
+using MareSynchronos.UI.Handlers;
+using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.UI;
+
+public class DrawEntityFactory
+{
+    private readonly ILogger<DrawEntityFactory> _logger;
+    private readonly ApiController _apiController;
+    private readonly MareMediator _mediator;
+    private readonly SelectPairForTagUi _selectPairForTagUi;
+    private readonly ServerConfigurationManager _serverConfigurationManager;
+    private readonly SelectTagForPairUi _selectTagForPairUi;
+    private readonly TagHandler _tagHandler;
+    private readonly IdDisplayHandler _uidDisplayHandler;
+
+    public DrawEntityFactory(ILogger<DrawEntityFactory> logger, ApiController apiController, IdDisplayHandler uidDisplayHandler,
+        SelectTagForPairUi selectTagForPairUi, MareMediator mediator,
+        TagHandler tagHandler, SelectPairForTagUi selectPairForTagUi,
+        ServerConfigurationManager serverConfigurationManager)
+    {
+        _logger = logger;
+        _apiController = apiController;
+        _uidDisplayHandler = uidDisplayHandler;
+        _selectTagForPairUi = selectTagForPairUi;
+        _mediator = mediator;
+        _tagHandler = tagHandler;
+        _selectPairForTagUi = selectPairForTagUi;
+        _serverConfigurationManager = serverConfigurationManager;
+    }
+
+    public DrawFolderGroup CreateDrawGroupFolder(GroupFullInfoDto groupFullInfoDto, Dictionary<Pair, List<GroupFullInfoDto>> pairs)
+    {
+        _logger.LogTrace("Creating new DrawGroupFolder for {gid}", groupFullInfoDto.GID);
+        return new DrawFolderGroup(groupFullInfoDto.Group.GID, groupFullInfoDto, _apiController,
+            pairs.Select(p => CreateDrawPair(groupFullInfoDto.Group.GID + p.Key.UserData.UID, p.Key, p.Value)).ToList(),
+            _tagHandler, _uidDisplayHandler, _mediator);
+    }
+
+    public DrawFolderTag CreateDrawTagFolder(string tag, Dictionary<Pair, List<GroupFullInfoDto>> pairs)
+    {
+        _logger.LogTrace("Creating new DrawTagFolder for {tag}", tag);
+
+        return new(tag, pairs.Select(u => CreateDrawPair(tag, u.Key, u.Value)).ToList(),
+            _tagHandler, _apiController, _selectPairForTagUi);
+    }
+
+    public DrawUserPair CreateDrawPair(string id, Pair user, List<GroupFullInfoDto> groups)
+    {
+        _logger.LogTrace("Creating new DrawPair for {id}", id + user.UserData.UID);
+
+        return new DrawUserPair(id + user.UserData.UID, user, groups, _apiController, _uidDisplayHandler,
+            _mediator, _selectTagForPairUi, _serverConfigurationManager);
+    }
+}

MareSynchronos/UI/DtrEntry.cs

@@ -14,11 +14,11 @@ public sealed class DtrEntry : IDisposable, IHostedService
 {
     private readonly ApiController _apiController;
     private readonly CancellationTokenSource _cancellationTokenSource = new();
-    private readonly ILogger<DtrEntry> _logger;
-    private readonly IDtrBar _dtrBar;
     private readonly ConfigurationServiceBase<MareConfig> _configService;
-    private readonly MareMediator _mareMediator;
+    private readonly IDtrBar _dtrBar;
     private readonly Lazy<DtrBarEntry> _entry;
+    private readonly ILogger<DtrEntry> _logger;
+    private readonly MareMediator _mareMediator;
     private readonly PairManager _pairManager;
     private Task? _runTask;
     private string? _text;
@@ -67,15 +67,6 @@ public sealed class DtrEntry : IDisposable, IHostedService
         }
     }
 
-    private DtrBarEntry CreateEntry()
-    {
-        _logger.LogTrace("Creating new DtrBar entry");
-        var entry = _dtrBar.Get("Mare Synchronos");
-        entry.OnClick = () => _mareMediator.Publish(new UiToggleMessage(typeof(CompactUi)));
-
-        return entry;
-    }
-
     private void Clear()
     {
         if (!_entry.IsValueCreated) return;
@@ -85,6 +76,15 @@ public sealed class DtrEntry : IDisposable, IHostedService
         _entry.Value.Shown = false;
     }
 
+    private DtrBarEntry CreateEntry()
+    {
+        _logger.LogTrace("Creating new DtrBar entry");
+        var entry = _dtrBar.Get("Mare Synchronos");
+        entry.OnClick = () => _mareMediator.Publish(new UiToggleMessage(typeof(CompactUi)));
+
+        return entry;
+    }
+
     private async Task RunAsync()
     {
         while (!_cancellationTokenSource.IsCancellationRequested)

MareSynchronos/UI/EditProfileUi.cs

@@ -26,7 +26,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
     private string _descriptionText = string.Empty;
     private IDalamudTextureWrap? _pfpTextureWrap;
     private string _profileDescription = string.Empty;
-    private byte[] _profileImage = Array.Empty<byte>();
+    private byte[] _profileImage = [];
     private bool _showFileDialogError = false;
     private bool _wasOpen;
 
@@ -136,7 +136,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
             _fileDialogManager.OpenFileDialog("Select new Profile picture", ".png", (success, file) =>
             {
                 if (!success) return;
-                Task.Run(async () =>
+                _ = Task.Run(async () =>
                 {
                     var fileContent = File.ReadAllBytes(file);
                     using MemoryStream ms = new(fileContent);
@@ -155,7 +155,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
                     }
 
                     _showFileDialogError = false;
-                    await _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), false, null, Convert.ToBase64String(fileContent), null))
+                    await _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, Convert.ToBase64String(fileContent), Description: null))
                         .ConfigureAwait(false);
                 });
             });
@@ -164,7 +164,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
         ImGui.SameLine();
         if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear uploaded profile picture"))
         {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), false, null, "", null));
+            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, "", Description: null));
         }
         UiSharedService.AttachToolTip("Clear your currently uploaded profile picture");
         if (_showFileDialogError)
@@ -174,7 +174,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
         var isNsfw = profile.IsNSFW;
         if (ImGui.Checkbox("Profile is NSFW", ref isNsfw))
         {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), false, isNsfw, null, null));
+            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, isNsfw, ProfilePictureBase64: null, Description: null));
         }
         UiSharedService.DrawHelpText("If your profile description or image can be considered NSFW, toggle this to ON");
         var widthTextBox = 400;
@@ -213,13 +213,13 @@ public class EditProfileUi : WindowMediatorSubscriberBase
 
         if (UiSharedService.IconTextButton(FontAwesomeIcon.Save, "Save Description"))
         {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), false, null, null, _descriptionText));
+            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, ProfilePictureBase64: null, _descriptionText));
         }
         UiSharedService.AttachToolTip("Sets your profile description text");
         ImGui.SameLine();
         if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear Description"))
         {
-            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), false, null, null, ""));
+            _ = _apiController.UserSetProfile(new UserProfileDto(new UserData(_apiController.UID), Disabled: false, IsNSFW: null, ProfilePictureBase64: null, ""));
         }
         UiSharedService.AttachToolTip("Clears your profile description text");
     }

MareSynchronos/UI/GposeUi.cs

@@ -51,7 +51,7 @@ public class GposeUi : WindowMediatorSubscriberBase
                     _configService.Current.ExportFolder = Path.GetDirectoryName(path) ?? string.Empty;
                     _configService.Save();
 
-                    Task.Run(() => _mareCharaFileManager.LoadMareCharaFile(path));
+                    _ = Task.Run(() => _mareCharaFileManager.LoadMareCharaFile(path));
                 }, 1, Directory.Exists(_configService.Current.ExportFolder) ? _configService.Current.ExportFolder : null);
             }
             UiSharedService.AttachToolTip("Applies it to the currently selected GPose actor");
@@ -61,7 +61,7 @@ public class GposeUi : WindowMediatorSubscriberBase
                 UiSharedService.TextWrapped("File Description: " + _mareCharaFileManager.LoadedCharaFile.CharaFileData.Description);
                 if (UiSharedService.IconTextButton(FontAwesomeIcon.Check, "Apply loaded MCDF"))
                 {
-                    Task.Run(async () => await _mareCharaFileManager.ApplyMareCharaFile(_dalamudUtil.GposeTargetGameObject).ConfigureAwait(false));
+                    _ = Task.Run(async () => await _mareCharaFileManager.ApplyMareCharaFile(_dalamudUtil.GposeTargetGameObject).ConfigureAwait(false));
                 }
                 UiSharedService.AttachToolTip("Applies it to the currently selected GPose actor");
                 UiSharedService.ColorTextWrapped("Warning: redrawing or changing the character will revert all applied mods.", ImGuiColors.DalamudYellow);

MareSynchronos/UI/Handlers/IdDisplayHandler.cs

@@ -1,41 +1,96 @@
 using Dalamud.Interface;
+using Dalamud.Interface.Utility.Raii;
 using ImGuiNET;
-using MareSynchronos.PlayerData.Pairs;
-using MareSynchronos.Services.ServerConfiguration;
-using MareSynchronos.MareConfiguration;
 using ImGuiScene;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services.Mediator;
+using MareSynchronos.Services.ServerConfiguration;
 
 namespace MareSynchronos.UI.Handlers;
 
-public class UidDisplayHandler
+public class IdDisplayHandler
 {
     private readonly MareConfigService _mareConfigService;
     private readonly MareMediator _mediator;
-    private readonly PairManager _pairManager;
     private readonly ServerConfigurationManager _serverManager;
-    private readonly Dictionary<string, bool> _showUidForEntry = new(StringComparer.Ordinal);
+    private readonly Dictionary<string, bool> _showIdForEntry = new(StringComparer.Ordinal);
-    private string _editNickEntry = string.Empty;
+    private string _editComment = string.Empty;
-    private string _editUserComment = string.Empty;
+    private string _editEntry = string.Empty;
+    private bool _editIsUid = false;
     private string _lastMouseOverUid = string.Empty;
     private bool _popupShown = false;
     private DateTime? _popupTime;
     private TextureWrap? _textureWrap;
 
-    public UidDisplayHandler(MareMediator mediator, PairManager pairManager,
+    public IdDisplayHandler(MareMediator mediator, ServerConfigurationManager serverManager, MareConfigService mareConfigService)
-        ServerConfigurationManager serverManager, MareConfigService mareConfigService)
     {
         _mediator = mediator;
-        _pairManager = pairManager;
         _serverManager = serverManager;
         _mareConfigService = mareConfigService;
     }
 
+    public void DrawGroupText(string id, GroupFullInfoDto group, float textPosX, float originalY, Func<float> editBoxWidth)
+    {
+        ImGui.SameLine(textPosX);
+        (bool textIsUid, string playerText) = GetGroupText(group);
+        if (!string.Equals(_editEntry, group.GID, StringComparison.Ordinal))
+        {
+            ImGui.SetCursorPosY(originalY);
+            using (ImRaii.PushFont(UiBuilder.MonoFont, textIsUid))
+                ImGui.TextUnformatted(playerText);
+
+            if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
+            {
+                var prevState = textIsUid;
+                if (_showIdForEntry.ContainsKey(group.GID))
+                {
+                    prevState = _showIdForEntry[group.GID];
+                }
+                _showIdForEntry[group.GID] = !prevState;
+            }
+
+            if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
+            {
+                if (_editIsUid)
+                {
+                    _serverManager.SetNoteForUid(_editEntry, _editComment, save: true);
+                }
+                else
+                {
+                    _serverManager.SetNoteForGid(_editEntry, _editComment, save: true);
+                }
+
+                _editComment = _serverManager.GetNoteForGid(group.GID) ?? string.Empty;
+                _editEntry = group.GID;
+                _editIsUid = false;
+            }
+        }
+        else
+        {
+            ImGui.SetCursorPosY(originalY);
+
+            ImGui.SetNextItemWidth(editBoxWidth.Invoke());
+            if (ImGui.InputTextWithHint("", "Name/Notes", ref _editComment, 255, ImGuiInputTextFlags.EnterReturnsTrue))
+            {
+                _serverManager.SetNoteForGid(group.GID, _editComment, save: true);
+                _editEntry = string.Empty;
+            }
+
+            if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
+            {
+                _editEntry = string.Empty;
+            }
+            UiSharedService.AttachToolTip("Hit ENTER to save\nRight click to cancel");
+        }
+    }
+
     public void DrawPairText(string id, Pair pair, float textPosX, float originalY, Func<float> editBoxWidth)
     {
         ImGui.SameLine(textPosX);
         (bool textIsUid, string playerText) = GetPlayerText(pair);
-        if (!string.Equals(_editNickEntry, pair.UserData.UID, StringComparison.Ordinal))
+        if (!string.Equals(_editEntry, pair.UserData.UID, StringComparison.Ordinal))
         {
             ImGui.SetCursorPosY(originalY);
             if (textIsUid) ImGui.PushFont(UiBuilder.MonoFont);
@@ -66,7 +121,7 @@ public class UidDisplayHandler
             {
                 if (string.Equals(_lastMouseOverUid, id))
                 {
-                    _mediator.Publish(new ProfilePopoutToggle(null));
+                    _mediator.Publish(new ProfilePopoutToggle(Pair: null));
                     _lastMouseOverUid = string.Empty;
                     _popupShown = false;
                     _textureWrap?.Dispose();
@@ -77,19 +132,27 @@ public class UidDisplayHandler
             if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
             {
                 var prevState = textIsUid;
-                if (_showUidForEntry.ContainsKey(pair.UserData.UID))
+                if (_showIdForEntry.ContainsKey(pair.UserData.UID))
                 {
-                    prevState = _showUidForEntry[pair.UserData.UID];
+                    prevState = _showIdForEntry[pair.UserData.UID];
                 }
-                _showUidForEntry[pair.UserData.UID] = !prevState;
+                _showIdForEntry[pair.UserData.UID] = !prevState;
             }
 
             if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
             {
-                var nickEntryPair = _pairManager.DirectPairs.Find(p => string.Equals(p.UserData.UID, _editNickEntry, StringComparison.Ordinal));
+                if (_editIsUid)
-                nickEntryPair?.SetNote(_editUserComment);
+                {
-                _editUserComment = pair.GetNote() ?? string.Empty;
+                    _serverManager.SetNoteForUid(_editEntry, _editComment, save: true);
-                _editNickEntry = pair.UserData.UID;
+                }
+                else
+                {
+                    _serverManager.SetNoteForGid(_editEntry, _editComment, save: true);
+                }
+
+                _editComment = pair.GetNote() ?? string.Empty;
+                _editEntry = pair.UserData.UID;
+                _editIsUid = true;
             }
 
             if (ImGui.IsItemClicked(ImGuiMouseButton.Middle))
@@ -102,21 +165,45 @@ public class UidDisplayHandler
             ImGui.SetCursorPosY(originalY);
 
             ImGui.SetNextItemWidth(editBoxWidth.Invoke());
-            if (ImGui.InputTextWithHint("", "Nick/Notes", ref _editUserComment, 255, ImGuiInputTextFlags.EnterReturnsTrue))
+            if (ImGui.InputTextWithHint("", "Nick/Notes", ref _editComment, 255, ImGuiInputTextFlags.EnterReturnsTrue))
             {
-                _serverManager.SetNoteForUid(pair.UserData.UID, _editUserComment);
+                _serverManager.SetNoteForUid(pair.UserData.UID, _editComment);
                 _serverManager.SaveNotes();
-                _editNickEntry = string.Empty;
+                _editEntry = string.Empty;
             }
 
             if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
             {
-                _editNickEntry = string.Empty;
+                _editEntry = string.Empty;
             }
             UiSharedService.AttachToolTip("Hit ENTER to save\nRight click to cancel");
         }
     }
 
+    public (bool isGid, string text) GetGroupText(GroupFullInfoDto group)
+    {
+        var textIsGid = true;
+        bool showUidInsteadOfName = ShowGidInsteadOfName(group);
+        string? groupText = _serverManager.GetNoteForGid(group.GID);
+        if (!showUidInsteadOfName && groupText != null)
+        {
+            if (string.IsNullOrEmpty(groupText))
+            {
+                groupText = group.GroupAliasOrGID;
+            }
+            else
+            {
+                textIsGid = false;
+            }
+        }
+        else
+        {
+            groupText = group.GroupAliasOrGID;
+        }
+
+        return (textIsGid, groupText!);
+    }
+
     public (bool isUid, string text) GetPlayerText(Pair pair)
     {
         var textIsUid = true;
@@ -157,8 +244,8 @@ public class UidDisplayHandler
 
     internal void Clear()
     {
-        _editNickEntry = string.Empty;
+        _editEntry = string.Empty;
-        _editUserComment = string.Empty;
+        _editComment = string.Empty;
     }
 
     internal void OpenProfile(Pair entry)
@@ -166,10 +253,17 @@ public class UidDisplayHandler
         _mediator.Publish(new ProfileOpenStandaloneMessage(entry));
     }
 
+    private bool ShowGidInsteadOfName(GroupFullInfoDto group)
+    {
+        _showIdForEntry.TryGetValue(group.GID, out var showidInsteadOfName);
+
+        return showidInsteadOfName;
+    }
+
     private bool ShowUidInsteadOfName(Pair pair)
     {
-        _showUidForEntry.TryGetValue(pair.UserData.UID, out var showUidInsteadOfName);
+        _showIdForEntry.TryGetValue(pair.UserData.UID, out var showidInsteadOfName);
 
-        return showUidInsteadOfName;
+        return showidInsteadOfName;
     }
 }

MareSynchronos/UI/Handlers/TagHandler.cs

@@ -4,6 +4,7 @@ namespace MareSynchronos.UI.Handlers;
 
 public class TagHandler
 {
+    public const string CustomAllTag = "Mare_All";
     public const string CustomOfflineTag = "Mare_Offline";
     public const string CustomOnlineTag = "Mare_Online";
     public const string CustomUnpairedTag = "Mare_Unpaired";
@@ -27,9 +28,12 @@ public class TagHandler
 
     public List<string> GetAllTagsSorted()
     {
-        return _serverConfigurationManager.GetServerAvailablePairTags()
+        return
-            .OrderBy(s => s, StringComparer.OrdinalIgnoreCase)
+        [
-            .ToList();
+            .. _serverConfigurationManager.GetServerAvailablePairTags()
+                        .OrderBy(s => s, StringComparer.OrdinalIgnoreCase)
+,
+        ];
     }
 
     public HashSet<string> GetOtherUidsForTag(string tag)
@@ -59,7 +63,6 @@ public class TagHandler
 
     public void RemoveTag(string tag)
     {
-        // First remove the tag from teh available pair tags
         _serverConfigurationManager.RemoveTag(tag);
     }
 

MareSynchronos/UI/IntroUI.cs

@@ -214,7 +214,7 @@ public class IntroUi : WindowMediatorSubscriberBase
             var buttonWidth = _secretKey.Length != 64 ? 0 : ImGuiHelpers.GetButtonSize(buttonText).X + ImGui.GetStyle().ItemSpacing.X;
             var textSize = ImGui.CalcTextSize(text);
             ImGui.AlignTextToFramePadding();
-            ImGui.Text(text);
+            ImGui.TextUnformatted(text);
             ImGui.SameLine();
             ImGui.SetNextItemWidth(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X - buttonWidth - textSize.X);
             ImGui.InputText("", ref _secretKey, 64);
@@ -235,7 +235,7 @@ public class IntroUi : WindowMediatorSubscriberBase
                     });
                     _serverConfigurationManager.AddCurrentCharacterToServer(addLastSecretKey: true);
                     _secretKey = string.Empty;
-                    Task.Run(() => _uiShared.ApiController.CreateConnections(forceGetToken: true));
+                    _ = Task.Run(() => _uiShared.ApiController.CreateConnections());
                 }
             }
         }
@@ -253,6 +253,6 @@ public class IntroUi : WindowMediatorSubscriberBase
             _uiShared.LoadLocalization(_languages.ElementAt(changeLanguageTo).Value);
         }
 
-        _tosParagraphs = new[] { Strings.ToS.Paragraph1, Strings.ToS.Paragraph2, Strings.ToS.Paragraph3, Strings.ToS.Paragraph4, Strings.ToS.Paragraph5, Strings.ToS.Paragraph6 };
+        _tosParagraphs = [Strings.ToS.Paragraph1, Strings.ToS.Paragraph2, Strings.ToS.Paragraph3, Strings.ToS.Paragraph4, Strings.ToS.Paragraph5, Strings.ToS.Paragraph6];
     }
 }

MareSynchronos/UI/PopoutProfileUi.cs

@@ -1,47 +1,49 @@
 using Dalamud.Interface.Colors;
+using Dalamud.Interface.Internal;
+
+using Dalamud.Interface.Utility;
 using ImGuiNET;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.MareConfiguration;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using Microsoft.Extensions.Logging;
 using System.Numerics;
-using MareSynchronos.API.Data.Extensions;
-using MareSynchronos.MareConfiguration;
-using Dalamud.Interface.Utility;
-using Dalamud.Interface.Internal;
 
 namespace MareSynchronos.UI;
 
 public class PopoutProfileUi : WindowMediatorSubscriberBase
 {
     private readonly MareProfileManager _mareProfileManager;
+    private readonly PairManager _pairManager;
     private readonly ServerConfigurationManager _serverManager;
     private readonly UiSharedService _uiSharedService;
     private Vector2 _lastMainPos = Vector2.Zero;
     private Vector2 _lastMainSize = Vector2.Zero;
-    private byte[] _lastProfilePicture = Array.Empty<byte>();
+    private byte[] _lastProfilePicture = [];
-    private byte[] _lastSupporterPicture = Array.Empty<byte>();
+    private byte[] _lastSupporterPicture = [];
     private Pair? _pair;
     private IDalamudTextureWrap? _supporterTextureWrap;
     private IDalamudTextureWrap? _textureWrap;
 
     public PopoutProfileUi(ILogger<PopoutProfileUi> logger, MareMediator mediator, UiSharedService uiBuilder,
         ServerConfigurationManager serverManager, MareConfigService mareConfigService,
-        MareProfileManager mareProfileManager) : base(logger, mediator, "###MareSynchronosPopoutProfileUI")
+        MareProfileManager mareProfileManager, PairManager pairManager) : base(logger, mediator, "###MareSynchronosPopoutProfileUI")
     {
         _uiSharedService = uiBuilder;
         _serverManager = serverManager;
         _mareProfileManager = mareProfileManager;
-
+        _pairManager = pairManager;
         Flags = ImGuiWindowFlags.NoDecoration;
 
         Mediator.Subscribe<ProfilePopoutToggle>(this, (msg) =>
         {
             IsOpen = msg.Pair != null;
             _pair = msg.Pair;
-            _lastProfilePicture = Array.Empty<byte>();
+            _lastProfilePicture = [];
-            _lastSupporterPicture = Array.Empty<byte>();
+            _lastSupporterPicture = [];
             _textureWrap?.Dispose();
             _textureWrap = null;
             _supporterTextureWrap?.Dispose();
@@ -54,7 +56,6 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
             {
                 var border = ImGui.GetStyle().WindowBorderSize;
                 var padding = ImGui.GetStyle().WindowPadding;
-                var spacing = ImGui.GetStyle().ItemSpacing;
                 Size = new(256 + (padding.X * 2) + border, msg.Size.Y / ImGuiHelpers.GlobalScale);
                 _lastMainSize = msg.Size;
             }
@@ -65,7 +66,7 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
             }
             else
             {
-                Position = new(mainPos.X - Size.Value.X * ImGuiHelpers.GlobalScale, mainPos.Y);
+                Position = new(mainPos.X - Size!.Value.X * ImGuiHelpers.GlobalScale, mainPos.Y);
             }
 
             if (msg.Position != Vector2.Zero)
@@ -129,7 +130,7 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
                 ImGui.SameLine();
                 ImGui.TextUnformatted($"({_pair.PlayerName})");
             }
-            if (_pair.UserPair != null)
+            if (_pair.UserPair.IndividualPairStatus == API.Data.Enum.IndividualPairStatus.Bidirectional)
             {
                 ImGui.TextUnformatted("Directly paired");
                 if (_pair.UserPair.OwnPermissions.IsPaused())
@@ -143,13 +144,14 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
                     UiSharedService.ColorText("They: paused", ImGuiColors.DalamudYellow);
                 }
             }
-            if (_pair.GroupPair.Any())
+            if (_pair.UserPair.Groups.Any())
             {
                 ImGui.TextUnformatted("Paired through Syncshells:");
-                foreach (var groupPair in _pair.GroupPair.Select(k => k.Key))
+                foreach (var group in _pair.UserPair.Groups)
                 {
-                    var groupNote = _serverManager.GetNoteForGid(groupPair.GID);
+                    var groupNote = _serverManager.GetNoteForGid(group);
-                    var groupString = string.IsNullOrEmpty(groupNote) ? groupPair.GroupAliasOrGID : $"{groupNote} ({groupPair.GroupAliasOrGID})";
+                    var groupName = _pairManager.GroupPairs.First(f => string.Equals(f.Key.GID, group, StringComparison.Ordinal)).Key.GroupAliasOrGID;
+                    var groupString = string.IsNullOrEmpty(groupNote) ? groupName : $"{groupNote} ({groupName})";
                     ImGui.TextUnformatted("- " + groupString);
                 }
             }
@@ -162,7 +164,7 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
             bool trimmed = textSize.Y > remaining;
             while (textSize.Y > remaining && descText.Contains(' '))
             {
-                descText = descText.Substring(0, descText.LastIndexOf(' ')).TrimEnd();
+                descText = descText[..descText.LastIndexOf(' ')].TrimEnd();
                 textSize = ImGui.CalcTextSize(descText + $"...{Environment.NewLine}[Open Full Profile for complete description]", 256f * ImGuiHelpers.GlobalScale);
             }
             UiSharedService.TextWrapped(trimmed ? descText + $"...{Environment.NewLine}[Open Full Profile for complete description]" : mareProfile.Description);

MareSynchronos/UI/SettingsUi.cs

@@ -1,36 +1,37 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
-using ImGuiNET;
-using MareSynchronos.WebAPI;
-using System.Numerics;
 using Dalamud.Utility;
+using ImGuiNET;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Comparer;
+using MareSynchronos.FileCache;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.MareConfiguration.Models;
-using Microsoft.Extensions.Logging;
-using MareSynchronos.WebAPI.SignalR.Utils;
-using MareSynchronos.PlayerData.Pairs;
-using System.Text.Json;
 using MareSynchronos.PlayerData.Export;
+using MareSynchronos.PlayerData.Handlers;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
-using MareSynchronos.Services;
+using MareSynchronos.WebAPI;
 using MareSynchronos.WebAPI.Files;
 using MareSynchronos.WebAPI.Files.Models;
-using MareSynchronos.PlayerData.Handlers;
+using MareSynchronos.WebAPI.SignalR.Utils;
+using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
-using MareSynchronos.FileCache;
+using System.Numerics;
+using System.Text.Json;
 
 namespace MareSynchronos.UI;
 
 public class SettingsUi : WindowMediatorSubscriberBase
 {
+    private readonly ApiController _apiController;
     private readonly MareConfigService _configService;
     private readonly ConcurrentDictionary<GameObjectHandler, Dictionary<string, FileDownloadStatus>> _currentDownloads = new();
+    private readonly FileCompactor _fileCompactor;
     private readonly FileUploadManager _fileTransferManager;
     private readonly FileTransferOrchestrator _fileTransferOrchestrator;
-    private readonly FileCompactor _fileCompactor;
     private readonly MareCharaFileManager _mareCharaFileManager;
     private readonly PairManager _pairManager;
     private readonly PerformanceCollectorService _performanceCollector;
@@ -53,7 +54,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         MareMediator mediator, PerformanceCollectorService performanceCollector,
         FileUploadManager fileTransferManager,
         FileTransferOrchestrator fileTransferOrchestrator,
-        FileCompactor fileCompactor) : base(logger, mediator, "Mare Synchronos Settings")
+        FileCompactor fileCompactor, ApiController apiController) : base(logger, mediator, "Mare Synchronos Settings")
     {
         _configService = configService;
         _mareCharaFileManager = mareCharaFileManager;
@@ -62,6 +63,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         _performanceCollector = performanceCollector;
         _fileTransferManager = fileTransferManager;
         _fileTransferOrchestrator = fileTransferOrchestrator;
+        _apiController = apiController;
         _fileCompactor = fileCompactor;
         _uiShared = uiShared;
 
@@ -117,14 +119,14 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 ImGui.TableNextColumn();
                 if (item is UploadFileTransfer transfer)
                 {
-                    ImGui.Text(transfer.LocalFile);
+                    ImGui.TextUnformatted(transfer.LocalFile);
                 }
                 else
                 {
-                    ImGui.Text(item.Hash);
+                    ImGui.TextUnformatted(item.Hash);
                 }
                 ImGui.TableNextColumn();
-                ImGui.Text(item.ForbiddenBy);
+                ImGui.TextUnformatted(item.ForbiddenBy);
             }
             ImGui.EndTable();
         }
@@ -248,11 +250,11 @@ public class SettingsUi : WindowMediatorSubscriberBase
                         var color = UiSharedService.UploadColor((transfer.Transferred, transfer.Total));
                         ImGui.PushStyleColor(ImGuiCol.Text, color);
                         ImGui.TableNextColumn();
-                        ImGui.Text(transfer.Hash);
+                        ImGui.TextUnformatted(transfer.Hash);
                         ImGui.TableNextColumn();
-                        ImGui.Text(UiSharedService.ByteToString(transfer.Transferred));
+                        ImGui.TextUnformatted(UiSharedService.ByteToString(transfer.Transferred));
                         ImGui.TableNextColumn();
-                        ImGui.Text(UiSharedService.ByteToString(transfer.Total));
+                        ImGui.TextUnformatted(UiSharedService.ByteToString(transfer.Total));
                         ImGui.PopStyleColor();
                         ImGui.TableNextRow();
                     }
@@ -276,14 +278,14 @@ public class SettingsUi : WindowMediatorSubscriberBase
                         {
                             var color = UiSharedService.UploadColor((entry.Value.TransferredBytes, entry.Value.TotalBytes));
                             ImGui.TableNextColumn();
-                            ImGui.Text(userName);
+                            ImGui.TextUnformatted(userName);
                             ImGui.TableNextColumn();
-                            ImGui.Text(entry.Key);
+                            ImGui.TextUnformatted(entry.Key);
                             ImGui.PushStyleColor(ImGuiCol.Text, color);
                             ImGui.TableNextColumn();
-                            ImGui.Text(entry.Value.TransferredFiles + "/" + entry.Value.TotalFiles);
+                            ImGui.TextUnformatted(entry.Value.TransferredFiles + "/" + entry.Value.TotalFiles);
                             ImGui.TableNextColumn();
-                            ImGui.Text(UiSharedService.ByteToString(entry.Value.TransferredBytes) + "/" + UiSharedService.ByteToString(entry.Value.TotalBytes));
+                            ImGui.TextUnformatted(UiSharedService.ByteToString(entry.Value.TransferredBytes) + "/" + UiSharedService.ByteToString(entry.Value.TotalBytes));
                             ImGui.TableNextColumn();
                             ImGui.PopStyleColor();
                             ImGui.TableNextRow();
@@ -316,7 +318,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         {
             foreach (var l in JsonSerializer.Serialize(LastCreatedCharacterData, new JsonSerializerOptions() { WriteIndented = true }).Split('\n'))
             {
-                ImGui.Text($"{l}");
+                ImGui.TextUnformatted($"{l}");
             }
 
             ImGui.TreePop();
@@ -436,7 +438,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         _uiShared.DrawFileScanState();
         _uiShared.DrawTimeSpanBetweenScansSetting();
         _uiShared.DrawCacheDirectorySetting();
-        ImGui.Text($"Currently utilized local storage: {UiSharedService.ByteToString(_uiShared.FileCacheSize)}");
+        ImGui.TextUnformatted($"Currently utilized local storage: {UiSharedService.ByteToString(_uiShared.FileCacheSize)}");
         bool isLinux = Util.IsWine();
         if (isLinux) ImGui.BeginDisabled();
         bool useFileCompactor = _configService.Current.UseCompactor;
@@ -452,14 +454,14 @@ public class SettingsUi : WindowMediatorSubscriberBase
         {
             if (UiSharedService.IconTextButton(FontAwesomeIcon.FileArchive, "Compact all files in storage"))
             {
-                _ = Task.Run(() => _fileCompactor.CompactStorage(true));
+                _ = Task.Run(() => _fileCompactor.CompactStorage(compress: true));
             }
             UiSharedService.AttachToolTip("This will run compression on all files in your current Mare Storage." + Environment.NewLine
                 + "You do not need to run this manually if you keep the file compactor enabled.");
             ImGui.SameLine();
             if (UiSharedService.IconTextButton(FontAwesomeIcon.File, "Decompact all files in storage"))
             {
-                _ = Task.Run(() => _fileCompactor.CompactStorage(false));
+                _ = Task.Run(() => _fileCompactor.CompactStorage(compress: false));
             }
             UiSharedService.AttachToolTip("This will run decompression on all files in your current Mare Storage.");
         }
@@ -470,11 +472,11 @@ public class SettingsUi : WindowMediatorSubscriberBase
         if (isLinux)
         {
             ImGui.EndDisabled();
-            ImGui.Text("The file compactor is only available on Windows.");
+            ImGui.TextUnformatted("The file compactor is only available on Windows.");
         }
 
         ImGui.Dummy(new Vector2(10, 10));
-        ImGui.Text("To clear the local storage accept the following disclaimer");
+        ImGui.TextUnformatted("To clear the local storage accept the following disclaimer");
         ImGui.Indent();
         ImGui.Checkbox("##readClearCache", ref _readClearCache);
         ImGui.SameLine();
@@ -557,6 +559,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         var enableRightClickMenu = _configService.Current.EnableRightClickMenus;
         var enableDtrEntry = _configService.Current.EnableDtrEntry;
         var preferNotesInsteadOfName = _configService.Current.PreferNotesOverNamesForVisible;
+        var groupUpSyncshells = _configService.Current.GroupUpSyncshells;
 
         if (ImGui.Checkbox("Enable Game Right Click Menu Entries", ref enableRightClickMenu))
         {
@@ -576,6 +579,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         {
             _configService.Current.ShowVisibleUsersSeparately = showVisibleSeparate;
             _configService.Save();
+            Mediator.Publish(new RefreshUiMessage());
         }
         UiSharedService.DrawHelpText("This will show all currently visible users in a special 'Visible' group in the main UI.");
 
@@ -583,13 +587,23 @@ public class SettingsUi : WindowMediatorSubscriberBase
         {
             _configService.Current.ShowOfflineUsersSeparately = showOfflineSeparate;
             _configService.Save();
+            Mediator.Publish(new RefreshUiMessage());
         }
         UiSharedService.DrawHelpText("This will show all currently offline users in a special 'Offline' group in the main UI.");
 
+        if (ImGui.Checkbox("Group up all syncshells in one folder", ref groupUpSyncshells))
+        {
+            _configService.Current.GroupUpSyncshells = groupUpSyncshells;
+            _configService.Save();
+            Mediator.Publish(new RefreshUiMessage());
+        }
+        UiSharedService.DrawHelpText("This will group up all Syncshells in a special 'All Syncshells' folder in the main UI.");
+
         if (ImGui.Checkbox("Show player name for visible players", ref showNameInsteadOfNotes))
         {
             _configService.Current.ShowCharacterNameInsteadOfNotesForVisible = showNameInsteadOfNotes;
             _configService.Save();
+            Mediator.Publish(new RefreshUiMessage());
         }
         UiSharedService.DrawHelpText("This will show the character name instead of custom set note when a character is visible");
 
@@ -599,6 +613,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         {
             _configService.Current.PreferNotesOverNamesForVisible = preferNotesInsteadOfName;
             _configService.Save();
+            Mediator.Publish(new RefreshUiMessage());
         }
         UiSharedService.DrawHelpText("If you set a note for a player it will be shown instead of the player name");
         if (!_configService.Current.ShowCharacterNameInsteadOfNotesForVisible) ImGui.EndDisabled();
@@ -728,7 +743,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
             {
                 UiSharedService.TextWrapped(
                     "All your own uploaded files on the service will be deleted.\nThis operation cannot be undone.");
-                ImGui.Text("Are you sure you want to continue?");
+                ImGui.TextUnformatted("Are you sure you want to continue?");
                 ImGui.Separator();
                 ImGui.Spacing();
 
@@ -737,7 +752,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
                 if (ImGui.Button("Delete everything", new Vector2(buttonSize, 0)))
                 {
-                    Task.Run(_fileTransferManager.DeleteAllFiles);
+                    _ = Task.Run(_fileTransferManager.DeleteAllFiles);
                     _deleteFilesPopupModalShown = false;
                 }
 
@@ -765,7 +780,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 UiSharedService.TextWrapped(
                     "Your account and all associated files and data on the service will be deleted.");
                 UiSharedService.TextWrapped("Your UID will be removed from all pairing lists.");
-                ImGui.Text("Are you sure you want to continue?");
+                ImGui.TextUnformatted("Are you sure you want to continue?");
                 ImGui.Separator();
                 ImGui.Spacing();
 
@@ -774,7 +789,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
                 if (ImGui.Button("Delete account", new Vector2(buttonSize, 0)))
                 {
-                    Task.Run(ApiController.UserDelete);
+                    _ = Task.Run(ApiController.UserDelete);
                     _deleteAccountPopupModalShown = false;
                     Mediator.Publish(new SwitchToIntroUiMessage());
                 }
@@ -873,7 +888,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                     }
 
                     ImGui.Separator();
-                    if (!selectedServer.Authentications.Any(c => string.Equals(c.CharacterName, _uiShared.PlayerName, StringComparison.Ordinal)
+                    if (!selectedServer.Authentications.Exists(c => string.Equals(c.CharacterName, _uiShared.PlayerName, StringComparison.Ordinal)
                         && c.WorldId == _uiShared.WorldId))
                     {
                         if (UiSharedService.IconTextButton(FontAwesomeIcon.User, "Add current character"))
@@ -914,7 +929,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                             item.Value.Key = key;
                             _serverConfigurationManager.Save();
                         }
-                        if (!selectedServer.Authentications.Any(p => p.SecretKeyIdx == item.Key))
+                        if (!selectedServer.Authentications.Exists(p => p.SecretKeyIdx == item.Key))
                         {
                             if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Delete Secret Key") && UiSharedService.CtrlPressed())
                             {
@@ -982,6 +997,84 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 }
                 ImGui.EndTabItem();
             }
+
+            if (ImGui.BeginTabItem("Permission Settings"))
+            {
+                UiSharedService.FontText("Default Permission Settings", _uiShared.UidFont);
+                if (selectedServer == _serverConfigurationManager.CurrentServer && _apiController.IsConnected)
+                {
+                    UiSharedService.TextWrapped("Note: The default permissions settings here are not applied retroactively to existing pairs or joined Syncshells.");
+                    UiSharedService.TextWrapped("Note: The default permissions settings here are sent and stored on the connected service.");
+                    ImGui.Dummy(new(5f));
+                    var perms = _apiController.DefaultPermissions!;
+                    bool individualIsSticky = perms.IndividualIsSticky;
+                    bool disableIndividualSounds = perms.DisableIndividualSounds;
+                    bool disableIndividualAnimations = perms.DisableIndividualAnimations;
+                    bool disableIndividualVFX = perms.DisableIndividualVFX;
+                    if (ImGui.Checkbox("Individually set permissions become preferred permissions", ref individualIsSticky))
+                    {
+                        perms.IndividualIsSticky = individualIsSticky;
+                        _ = _apiController.UserUpdateDefaultPermissions(perms);
+                    }
+                    UiSharedService.DrawHelpText("The preferred attribute means that the permissions to that user will never change through any of your permission changes to Syncshells " +
+                        "(i.e. if you have paused one specific user in a Syncshell and they become preferred permissions, then pause and unpause the same Syncshell, the user will remain paused - " +
+                        "if a user does not have preferred permissions, it will follow the permissions of the Syncshell and be unpaused)." + Environment.NewLine + Environment.NewLine +
+                        "This setting means:" + Environment.NewLine +
+                        "  - All new individual pairs get their permissions defaulted to preferred permissions." + Environment.NewLine +
+                        "  - All individually set permissions for any pair will also automatically become preferred permissions. This includes pairs in Syncshells." + Environment.NewLine + Environment.NewLine +
+                        "It is possible to remove or set the preferred permission state for any pair at any time." + Environment.NewLine + Environment.NewLine +
+                        "If unsure, leave this setting off.");
+                    ImGui.Dummy(new(3f));
+
+                    if (ImGui.Checkbox("Disable individual pair sounds", ref disableIndividualSounds))
+                    {
+                        perms.DisableIndividualSounds = disableIndividualSounds;
+                        _ = _apiController.UserUpdateDefaultPermissions(perms);
+                    }
+                    UiSharedService.DrawHelpText("This setting will disable sound sync for all new individual pairs.");
+                    if (ImGui.Checkbox("Disable individual pair animations", ref disableIndividualAnimations))
+                    {
+                        perms.DisableIndividualAnimations = disableIndividualAnimations;
+                        _ = _apiController.UserUpdateDefaultPermissions(perms);
+                    }
+                    UiSharedService.DrawHelpText("This setting will disable animation sync for all new individual pairs.");
+                    if (ImGui.Checkbox("Disable individual pair VFX", ref disableIndividualVFX))
+                    {
+                        perms.DisableIndividualVFX = disableIndividualVFX;
+                        _ = _apiController.UserUpdateDefaultPermissions(perms);
+                    }
+                    UiSharedService.DrawHelpText("This setting will disable VFX sync for all new individual pairs.");
+                    ImGui.Dummy(new(5f));
+                    bool disableGroundSounds = perms.DisableGroupSounds;
+                    bool disableGroupAnimations = perms.DisableGroupAnimations;
+                    bool disableGroupVFX = perms.DisableGroupVFX;
+                    if (ImGui.Checkbox("Disable Syncshell pair sounds", ref disableGroundSounds))
+                    {
+                        perms.DisableGroupSounds = disableGroundSounds;
+                        _ = _apiController.UserUpdateDefaultPermissions(perms);
+                    }
+                    UiSharedService.DrawHelpText("This setting will disable sound sync for all non-sticky pairs in newly joined syncshells.");
+                    if (ImGui.Checkbox("Disable Syncshell pair animations", ref disableGroupAnimations))
+                    {
+                        perms.DisableGroupAnimations = disableGroupAnimations;
+                        _ = _apiController.UserUpdateDefaultPermissions(perms);
+                    }
+                    UiSharedService.DrawHelpText("This setting will disable animation sync for all non-sticky pairs in newly joined syncshells.");
+                    if (ImGui.Checkbox("Disable Syncshell pair VFX", ref disableGroupVFX))
+                    {
+                        perms.DisableGroupVFX = disableGroupVFX;
+                        _ = _apiController.UserUpdateDefaultPermissions(perms);
+                    }
+                    UiSharedService.DrawHelpText("This setting will disable VFX sync for all non-sticky pairs in newly joined syncshells.");
+                }
+                else
+                {
+                    UiSharedService.ColorTextWrapped("Default Permission Settings unavailable for this service. " +
+                        "You need to connect to this service to change the default permissions since they are stored on the service.", ImGuiColors.DalamudYellow);
+                }
+
+                ImGui.EndTabItem();
+            }
             ImGui.EndTabBar();
         }
     }
@@ -990,7 +1083,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
     {
         _uiShared.PrintServerState();
         ImGui.AlignTextToFramePadding();
-        ImGui.Text("Community and Support:");
+        ImGui.TextUnformatted("Community and Support:");
         ImGui.SameLine();
         if (ImGui.Button("Mare Synchronos Discord"))
         {
@@ -1043,4 +1136,4 @@ public class SettingsUi : WindowMediatorSubscriberBase
         _wasOpen = IsOpen;
         IsOpen = false;
     }
-}
+}

MareSynchronos/UI/StandaloneProfileUi.cs

@@ -1,37 +1,39 @@
 using Dalamud.Interface.Colors;
+using Dalamud.Interface.Internal;
+
+using Dalamud.Interface.Utility;
 using ImGuiNET;
+using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using Microsoft.Extensions.Logging;
 using System.Numerics;
-using MareSynchronos.API.Data.Extensions;
-using Dalamud.Interface.Utility;
-using Dalamud.Interface.Internal;
 
 namespace MareSynchronos.UI;
 
 public class StandaloneProfileUi : WindowMediatorSubscriberBase
 {
     private readonly MareProfileManager _mareProfileManager;
+    private readonly PairManager _pairManager;
     private readonly ServerConfigurationManager _serverManager;
     private readonly UiSharedService _uiSharedService;
     private bool _adjustedForScrollBars = false;
-    private byte[] _lastProfilePicture = Array.Empty<byte>();
+    private byte[] _lastProfilePicture = [];
-    private byte[] _lastSupporterPicture = Array.Empty<byte>();
+    private byte[] _lastSupporterPicture = [];
     private IDalamudTextureWrap? _supporterTextureWrap;
     private IDalamudTextureWrap? _textureWrap;
 
     public StandaloneProfileUi(ILogger<StandaloneProfileUi> logger, MareMediator mediator, UiSharedService uiBuilder,
-        ServerConfigurationManager serverManager, MareProfileManager mareProfileManager, Pair pair)
+        ServerConfigurationManager serverManager, MareProfileManager mareProfileManager, PairManager pairManager, Pair pair)
         : base(logger, mediator, "Mare Profile of " + pair.UserData.AliasOrUID + "##MareSynchronosStandaloneProfileUI" + pair.UserData.AliasOrUID)
     {
         _uiSharedService = uiBuilder;
         _serverManager = serverManager;
         _mareProfileManager = mareProfileManager;
         Pair = pair;
-
+        _pairManager = pairManager;
         Flags = ImGuiWindowFlags.NoResize | ImGuiWindowFlags.AlwaysAutoResize;
 
         var spacing = ImGui.GetStyle().ItemSpacing;
@@ -88,12 +90,12 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
             var descriptionChildHeight = rectMax.Y - pos.Y - rectMin.Y - spacing.Y * 2;
             if (descriptionTextSize.Y > descriptionChildHeight && !_adjustedForScrollBars)
             {
-                Size = Size.Value with { X = Size.Value.X + ImGui.GetStyle().ScrollbarSize };
+                Size = Size!.Value with { X = Size.Value.X + ImGui.GetStyle().ScrollbarSize };
                 _adjustedForScrollBars = true;
             }
             else if (descriptionTextSize.Y < descriptionChildHeight && _adjustedForScrollBars)
             {
-                Size = Size.Value with { X = Size.Value.X - ImGui.GetStyle().ScrollbarSize };
+                Size = Size!.Value with { X = Size.Value.X - ImGui.GetStyle().ScrollbarSize };
                 _adjustedForScrollBars = false;
             }
             var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, descriptionChildHeight);
@@ -137,13 +139,15 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
                     UiSharedService.ColorText("They: paused", ImGuiColors.DalamudYellow);
                 }
             }
-            if (Pair.GroupPair.Any())
+
+            if (Pair.UserPair.Groups.Any())
             {
                 ImGui.TextUnformatted("Paired through Syncshells:");
-                foreach (var groupPair in Pair.GroupPair.Select(k => k.Key))
+                foreach (var group in Pair.UserPair.Groups)
                 {
-                    var groupNote = _serverManager.GetNoteForGid(groupPair.GID);
+                    var groupNote = _serverManager.GetNoteForGid(group);
-                    var groupString = string.IsNullOrEmpty(groupNote) ? groupPair.GroupAliasOrGID : $"{groupNote} ({groupPair.GroupAliasOrGID})";
+                    var groupName = _pairManager.GroupPairs.First(f => string.Equals(f.Key.GID, group, StringComparison.Ordinal)).Key.GroupAliasOrGID;
+                    var groupString = string.IsNullOrEmpty(groupNote) ? groupName : $"{groupNote} ({groupName})";
                     ImGui.TextUnformatted("- " + groupString);
                 }
             }

MareSynchronos/UI/UISharedService.cs

@@ -129,17 +129,51 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
     public uint WorldId => _dalamudUtil.GetWorldId();
 
+    public const string TooltipSeparator = "--SEP--";
+
     public static void AttachToolTip(string text)
     {
         if (ImGui.IsItemHovered())
         {
-            ImGui.SetTooltip(text);
+            ImGui.BeginTooltip();
+            if (text.Contains(TooltipSeparator, StringComparison.Ordinal))
+            {
+                var splitText = text.Split(TooltipSeparator, StringSplitOptions.RemoveEmptyEntries);
+                for (int i = 0; i < splitText.Length; i++)
+                {
+                    ImGui.TextUnformatted(splitText[i]);
+                    if (i != splitText.Length - 1) ImGui.Separator();
+                }
+            }
+            else
+            {
+                ImGui.TextUnformatted(text);
+            }
+            ImGui.EndTooltip();
+        }
+    }
+
+    public static void BooleanToColoredIcon(bool value, bool inline = true)
+    {
+        using var font = ImRaii.PushFont(UiBuilder.IconFont);
+        using var colorgreen = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.HealerGreen, value);
+        using var colorred = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed, !value);
+
+        if (inline) ImGui.SameLine();
+
+        if (value)
+        {
+            ImGui.TextUnformatted(FontAwesomeIcon.Check.ToIconString());
+        }
+        else
+        {
+            ImGui.TextUnformatted(FontAwesomeIcon.Times.ToIconString());
         }
     }
 
     public static string ByteToString(long bytes, bool addSuffix = true)
     {
-        string[] suffix = { "B", "KiB", "MiB", "GiB", "TiB" };
+        string[] suffix = ["B", "KiB", "MiB", "GiB", "TiB"];
         int i;
         double dblSByte = bytes;
         for (i = 0; i < suffix.Length && bytes >= 1024; i++, bytes /= 1024)
@@ -315,42 +349,55 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         return ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
     }
 
-    public static bool IconTextButton(FontAwesomeIcon icon, string text, float? width = null)
+    public static bool IconTextButton(FontAwesomeIcon icon, string text, float? width = null, bool isInPopup = false)
     {
-        var buttonClicked = false;
+        var wasClicked = false;
 
         var iconSize = GetIconSize(icon);
         var textSize = ImGui.CalcTextSize(text);
         var padding = ImGui.GetStyle().FramePadding;
         var spacing = ImGui.GetStyle().ItemSpacing;
+        var cursor = ImGui.GetCursorPos();
+        var drawList = ImGui.GetWindowDrawList();
+        var pos = ImGui.GetWindowPos();
 
         Vector2 buttonSize;
-        var buttonSizeY = (iconSize.Y > textSize.Y ? iconSize.Y : textSize.Y) + padding.Y * 2;
+        var buttonSizeY = textSize.Y + padding.Y * 2;
+        var iconExtraSpacing = isInPopup ? padding.X * 2 : 0;
 
-        if (width == null)
+        var iconXoffset = iconSize.X <= iconSize.Y ? (iconSize.Y - iconSize.X) / 2f : 0;
+        var iconScaling = iconSize.X > iconSize.Y ? 1 / (iconSize.X / iconSize.Y) : 1;
+
+        if (width == null || width <= 0)
         {
-            var buttonSizeX = iconSize.X + textSize.X + padding.X * 2 + spacing.X;
+            var buttonSizeX = (iconScaling == 1 ? iconSize.Y : (iconSize.X * iconScaling)) 
-            buttonSize = new Vector2(buttonSizeX, buttonSizeY);
+                    + textSize.X + padding.X * 2 + spacing.X + (iconXoffset * 2);
+            buttonSize = new Vector2(buttonSizeX + iconExtraSpacing, buttonSizeY);
         }
         else
         {
             buttonSize = new Vector2(width.Value, buttonSizeY);
         }
 
-        if (ImGui.Button("###" + icon.ToIconString() + text, buttonSize))
+        using (ImRaii.PushColor(ImGuiCol.Button, ImGui.GetColorU32(ImGuiCol.PopupBg), isInPopup))
         {
-            buttonClicked = true;
+            if (ImGui.Button("###" + icon.ToIconString() + text, buttonSize))
+            {
+                wasClicked = true;
+            }
         }
 
-        ImGui.SameLine();
+        drawList.AddText(UiBuilder.IconFont, ImGui.GetFontSize() * iconScaling,
-        ImGui.SetCursorPosX(ImGui.GetCursorPosX() - buttonSize.X - padding.X);
+            new(pos.X + cursor.X + iconXoffset + padding.X,
-        ImGui.PushFont(UiBuilder.IconFont);
+                pos.Y + cursor.Y + (buttonSizeY - (iconSize.Y * iconScaling)) / 2f),
-        ImGui.Text(icon.ToIconString());
+            ImGui.GetColorU32(ImGuiCol.Text), icon.ToIconString());
-        ImGui.PopFont();
-        ImGui.SameLine();
-        ImGui.Text(text);
 
-        return buttonClicked;
+        drawList.AddText(UiBuilder.DefaultFont, ImGui.GetFontSize(),
+            new(pos.X + cursor.X + (padding.X) + spacing.X + (iconSize.X * iconScaling) + (iconXoffset * 2) + iconExtraSpacing,
+                pos.Y + cursor.Y + ((buttonSizeY - textSize.Y) / 2f)),
+            ImGui.GetColorU32(ImGuiCol.Text), text);
+
+        return wasClicked;
     }
 
     public static bool IsDirectoryWritable(string dirPath, bool throwIfFails = false)
@@ -571,14 +618,14 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
     public void DrawFileScanState()
     {
-        ImGui.Text("File Scanner Status");
+        ImGui.TextUnformatted("File Scanner Status");
         ImGui.SameLine();
         if (_cacheScanner.IsScanRunning)
         {
-            ImGui.Text("Scan is running");
+            ImGui.TextUnformatted("Scan is running");
-            ImGui.Text("Current Progress:");
+            ImGui.TextUnformatted("Current Progress:");
             ImGui.SameLine();
-            ImGui.Text(_cacheScanner.TotalFiles == 1
+            ImGui.TextUnformatted(_cacheScanner.TotalFiles == 1
                 ? "Collecting files"
                 : $"Processing {_cacheScanner.CurrentFileProgress}/{_cacheScanner.TotalFilesStorage} from storage ({_cacheScanner.TotalFiles} scanned in)");
             AttachToolTip("Note: it is possible to have more files in storage than scanned in, " +
@@ -587,7 +634,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         }
         else if (_configService.Current.FileScanPaused)
         {
-            ImGui.Text("File scanner is paused");
+            ImGui.TextUnformatted("File scanner is paused");
             ImGui.SameLine();
             if (ImGui.Button("Force Rescan##forcedrescan"))
             {
@@ -596,7 +643,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         }
         else if (_cacheScanner.HaltScanLocks.Any(f => f.Value > 0))
         {
-            ImGui.Text("Halted (" + string.Join(", ", _cacheScanner.HaltScanLocks.Where(f => f.Value > 0).Select(locker => locker.Key + ": " + locker.Value + " halt requests")) + ")");
+            ImGui.TextUnformatted("Halted (" + string.Join(", ", _cacheScanner.HaltScanLocks.Where(f => f.Value > 0).Select(locker => locker.Key + ": " + locker.Value + " halt requests")) + ")");
             ImGui.SameLine();
             if (ImGui.Button("Reset halt requests##clearlocks"))
             {
@@ -605,7 +652,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         }
         else
         {
-            ImGui.Text("Next scan in " + _cacheScanner.TimeUntilNextScan);
+            ImGui.TextUnformatted("Next scan in " + _cacheScanner.TimeUntilNextScan);
         }
     }
 
@@ -619,10 +666,10 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         var honorificColor = _honorificExists ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed;
         var check = FontAwesomeIcon.Check.ToIconString();
         var cross = FontAwesomeIcon.SquareXmark.ToIconString();
-        ImGui.Text("Mandatory Plugins:");
+        ImGui.TextUnformatted("Mandatory Plugins:");
 
         ImGui.SameLine();
-        ImGui.Text("Penumbra");
+        ImGui.TextUnformatted("Penumbra");
         ImGui.SameLine();
         FontText(_penumbraExists ? check : cross, UiBuilder.IconFont, penumbraColor);
         ImGui.SameLine();
@@ -630,16 +677,16 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         ImGui.Spacing();
 
         ImGui.SameLine();
-        ImGui.Text("Glamourer");
+        ImGui.TextUnformatted("Glamourer");
         ImGui.SameLine();
         FontText(_glamourerExists ? check : cross, UiBuilder.IconFont, glamourerColor);
         ImGui.SameLine();
         AttachToolTip($"Glamourer is " + (_glamourerExists ? "available and up to date." : "unavailable or not up to date."));
         ImGui.Spacing();
 
-        ImGui.Text("Optional Plugins:");
+        ImGui.TextUnformatted("Optional Plugins:");
         ImGui.SameLine();
-        ImGui.Text("SimpleHeels");
+        ImGui.TextUnformatted("SimpleHeels");
         ImGui.SameLine();
         FontText(_heelsExists ? check : cross, UiBuilder.IconFont, heelsColor);
         ImGui.SameLine();
@@ -647,7 +694,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         ImGui.Spacing();
 
         ImGui.SameLine();
-        ImGui.Text("Customize+");
+        ImGui.TextUnformatted("Customize+");
         ImGui.SameLine();
         FontText(_customizePlusExists ? check : cross, UiBuilder.IconFont, customizeColor);
         ImGui.SameLine();
@@ -655,7 +702,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         ImGui.Spacing();
 
         ImGui.SameLine();
-        ImGui.Text("Palette+");
+        ImGui.TextUnformatted("Palette+");
         ImGui.SameLine();
         FontText(_palettePlusExists ? check : cross, UiBuilder.IconFont, paletteColor);
         ImGui.SameLine();
@@ -663,7 +710,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         ImGui.Spacing();
 
         ImGui.SameLine();
-        ImGui.Text("Honorific");
+        ImGui.TextUnformatted("Honorific");
         ImGui.SameLine();
         FontText(_honorificExists ? check : cross, UiBuilder.IconFont, honorificColor);
         ImGui.SameLine();
@@ -792,9 +839,9 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
             ImGui.SameLine();
             ImGui.TextColored(ImGuiColors.ParsedGreen, _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture));
             ImGui.SameLine();
-            ImGui.Text("Users Online");
+            ImGui.TextUnformatted("Users Online");
             ImGui.SameLine();
-            ImGui.Text(")");
+            ImGui.TextUnformatted(")");
         }
     }
 

MareSynchronos/Utils/Crypto.cs

@@ -1,6 +1,7 @@
-using System.Security.Cryptography;
+using Dalamud.Game.ClientState.Objects.SubKinds;
+
+using System.Security.Cryptography;
 using System.Text;
-using Dalamud.Game.ClientState.Objects.SubKinds;
 
 namespace MareSynchronos.Utils;
 

MareSynchronos/Utils/VariousExtensions.cs

@@ -36,7 +36,7 @@ public static class VariousExtensions
         var charaDataToUpdate = new Dictionary<ObjectKind, HashSet<PlayerChanges>>();
         foreach (ObjectKind objectKind in Enum.GetValues<ObjectKind>())
         {
-            charaDataToUpdate[objectKind] = new();
+            charaDataToUpdate[objectKind] = [];
             oldData.FileReplacements.TryGetValue(objectKind, out var existingFileReplacements);
             newData.FileReplacements.TryGetValue(objectKind, out var newFileReplacements);
             oldData.GlamourerData.TryGetValue(objectKind, out var existingGlamourerData);
@@ -127,7 +127,7 @@ public static class VariousExtensions
         foreach (KeyValuePair<ObjectKind, HashSet<PlayerChanges>> data in charaDataToUpdate.ToList())
         {
             if (!data.Value.Any()) charaDataToUpdate.Remove(data.Key);
-            else charaDataToUpdate[data.Key] = data.Value.OrderByDescending(p => (int)p).ToHashSet();
+            else charaDataToUpdate[data.Key] = [.. data.Value.OrderByDescending(p => (int)p)];
         }
 
         return charaDataToUpdate;

MareSynchronos/WebAPI/Files/FileDownloadManager.cs

@@ -16,8 +16,8 @@ namespace MareSynchronos.WebAPI.Files;
 public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 {
     private readonly Dictionary<string, FileDownloadStatus> _downloadStatus;
-    private readonly FileCacheManager _fileDbManager;
     private readonly FileCompactor _fileCompactor;
+    private readonly FileCacheManager _fileDbManager;
     private readonly FileTransferOrchestrator _orchestrator;
 
     public FileDownloadManager(ILogger<FileDownloadManager> logger, MareMediator mediator,
@@ -30,12 +30,20 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         _fileCompactor = fileCompactor;
     }
 
-    public List<DownloadFileTransfer> CurrentDownloads { get; private set; } = new();
+    public List<DownloadFileTransfer> CurrentDownloads { get; private set; } = [];
 
     public List<FileTransfer> ForbiddenTransfers => _orchestrator.ForbiddenTransfers;
 
     public bool IsDownloading => !CurrentDownloads.Any();
 
+    public static void MungeBuffer(Span<byte> buffer)
+    {
+        for (int i = 0; i < buffer.Length; ++i)
+        {
+            buffer[i] ^= 42;
+        }
+    }
+
     public void CancelDownload()
     {
         CurrentDownloads.Clear();
@@ -66,14 +74,6 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         base.Dispose(disposing);
     }
 
-    public static void MungeBuffer(Span<byte> buffer)
-    {
-        for (int i = 0; i < buffer.Length; ++i)
-        {
-            buffer[i] ^= 42;
-        }
-    }
-
     private static byte MungeByte(int byteOrEof)
     {
         if (byteOrEof == -1)
@@ -86,8 +86,8 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
     private static (string fileHash, long fileLengthBytes) ReadBlockFileHeader(FileStream fileBlockStream)
     {
-        List<char> hashName = new();
+        List<char> hashName = [];
-        List<char> fileLength = new();
+        List<char> fileLength = [];
         var separator = (char)MungeByte(fileBlockStream.ReadByte());
         if (separator != '#') throw new InvalidDataException("Data is invalid, first char is not #");
 
@@ -177,8 +177,10 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
     {
         Logger.LogDebug("Download start: {id}", gameObjectHandler.Name);
 
-        List<DownloadFileDto> downloadFileInfoFromService = new();
+        List<DownloadFileDto> downloadFileInfoFromService =
-        downloadFileInfoFromService.AddRange(await FilesGetSizes(fileReplacement.Select(f => f.Hash).Distinct(StringComparer.Ordinal).ToList(), ct).ConfigureAwait(false));
+        [
+            .. await FilesGetSizes(fileReplacement.Select(f => f.Hash).Distinct(StringComparer.Ordinal).ToList(), ct).ConfigureAwait(false),
+        ];
 
         Logger.LogDebug("Files with size 0 or less: {files}", string.Join(", ", downloadFileInfoFromService.Where(f => f.Size <= 0).Select(f => f.Hash)));
 
@@ -219,9 +221,10 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
             // let server predownload files
             var requestIdResponse = await _orchestrator.SendRequestAsync(HttpMethod.Post, MareFiles.RequestEnqueueFullPath(fileGroup.First().DownloadUri),
                 fileGroup.Select(c => c.Hash), token).ConfigureAwait(false);
-            Logger.LogDebug("Sent request for {n} files on server {uri} with result {result}", fileGroup.Count(), fileGroup.First().DownloadUri, requestIdResponse.Content.ReadAsStringAsync().Result);
+            Logger.LogDebug("Sent request for {n} files on server {uri} with result {result}", fileGroup.Count(), fileGroup.First().DownloadUri,
+                await requestIdResponse.Content.ReadAsStringAsync(token).ConfigureAwait(false));
 
-            Guid requestId = Guid.Parse(requestIdResponse.Content.ReadAsStringAsync().Result.Trim('"'));
+            Guid requestId = Guid.Parse((await requestIdResponse.Content.ReadAsStringAsync().ConfigureAwait(false)).Trim('"'));
 
             Logger.LogDebug("GUID {requestId} for {n} files on server {uri}", requestId, fileGroup.Count(), fileGroup.First().DownloadUri);
 
@@ -235,15 +238,15 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
                 {
                     try
                     {
-                        if (!_downloadStatus.ContainsKey(fileGroup.Key)) return;
+                        if (!_downloadStatus.TryGetValue(fileGroup.Key, out FileDownloadStatus? value)) return;
-                        _downloadStatus[fileGroup.Key].TransferredBytes += bytesDownloaded;
+                        value.TransferredBytes += bytesDownloaded;
                     }
                     catch (Exception ex)
                     {
                         Logger.LogWarning(ex, "Could not set download progress");
                     }
                 });
-                await DownloadAndMungeFileHttpClient(fileGroup.Key, requestId, fileGroup.ToList(), blockFile, progress, token).ConfigureAwait(false);
+                await DownloadAndMungeFileHttpClient(fileGroup.Key, requestId, [.. fileGroup], blockFile, progress, token).ConfigureAwait(false);
             }
             catch (OperationCanceledException)
             {
@@ -275,7 +278,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
                     try
                     {
                         Logger.LogDebug("Found file {file} with length {le}, decompressing download", fileHash, fileLengthBytes);
-                        var fileExtension = fileReplacement.First(f => string.Equals(f.Hash, fileHash, StringComparison.OrdinalIgnoreCase)).GamePaths[0].Split(".").Last();
+                        var fileExtension = fileReplacement.First(f => string.Equals(f.Hash, fileHash, StringComparison.OrdinalIgnoreCase)).GamePaths[0].Split(".")[^1];
 
                         byte[] compressedFileContent = new byte[fileLengthBytes];
                         _ = await fileBlockStream.ReadAsync(compressedFileContent, token).ConfigureAwait(false);
@@ -300,7 +303,8 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
             finally
             {
                 _orchestrator.ReleaseDownloadSlot();
-                fileBlockStream?.Dispose();
+                if (fileBlockStream != null)
+                    await fileBlockStream.DisposeAsync().ConfigureAwait(false);
                 File.Delete(blockFile);
             }
         }).ConfigureAwait(false);
@@ -314,7 +318,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
     {
         if (!_orchestrator.IsInitialized) throw new InvalidOperationException("FileTransferManager is not initialized");
         var response = await _orchestrator.SendRequestAsync(HttpMethod.Get, MareFiles.ServerFilesGetSizesFullPath(_orchestrator.FilesCdnUri!), hashes, ct).ConfigureAwait(false);
-        return await response.Content.ReadFromJsonAsync<List<DownloadFileDto>>(cancellationToken: ct).ConfigureAwait(false) ?? new List<DownloadFileDto>();
+        return await response.Content.ReadFromJsonAsync<List<DownloadFileDto>>(cancellationToken: ct).ConfigureAwait(false) ?? [];
     }
 
     private void PersistFileToStorage(string fileHash, string filePath)
@@ -322,7 +326,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         var fi = new FileInfo(filePath);
         Func<DateTime> RandomDayInThePast()
         {
-            DateTime start = new(1995, 1, 1);
+            DateTime start = new(1995, 1, 1, 1, 1, 1, DateTimeKind.Local);
             Random gen = new();
             int range = (DateTime.Today - start).Days;
             return () => start.AddDays(gen.Next(range));
@@ -334,9 +338,9 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
         try
         {
             var entry = _fileDbManager.CreateCacheEntry(filePath);
-            if (!string.Equals(entry?.Hash, fileHash, StringComparison.OrdinalIgnoreCase))
+            if (entry != null && !string.Equals(entry.Hash, fileHash, StringComparison.OrdinalIgnoreCase))
             {
-                Logger.LogError("Hash mismatch after extracting, got {hash}, expected {expectedHash}, deleting file", entry?.Hash, fileHash);
+                Logger.LogError("Hash mismatch after extracting, got {hash}, expected {expectedHash}, deleting file", entry.Hash, fileHash);
                 File.Delete(filePath);
                 _fileDbManager.RemoveHashedFile(entry.Hash, entry.PrefixedFilePath);
             }

MareSynchronos/WebAPI/Files/FileTransferOrchestrator.cs

@@ -1,7 +1,7 @@
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.Services.Mediator;
-using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.WebAPI.Files.Models;
+using MareSynchronos.WebAPI.SignalR;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.Net.Http.Headers;
@@ -12,20 +12,23 @@ namespace MareSynchronos.WebAPI.Files;
 
 public class FileTransferOrchestrator : DisposableMediatorSubscriberBase
 {
+    private readonly ConcurrentDictionary<Guid, bool> _downloadReady = new();
     private readonly HttpClient _httpClient;
     private readonly MareConfigService _mareConfig;
     private readonly object _semaphoreModificationLock = new();
-    private readonly ServerConfigurationManager _serverManager;
+    private readonly TokenProvider _tokenProvider;
     private int _availableDownloadSlots;
     private SemaphoreSlim _downloadSemaphore;
-    private readonly ConcurrentDictionary<Guid, bool> _downloadReady = new();
 
-    public FileTransferOrchestrator(ILogger<FileTransferOrchestrator> logger, MareConfigService mareConfig, ServerConfigurationManager serverManager, MareMediator mediator) : base(logger, mediator)
+    public FileTransferOrchestrator(ILogger<FileTransferOrchestrator> logger, MareConfigService mareConfig,
+        MareMediator mediator, TokenProvider tokenProvider) : base(logger, mediator)
     {
         _mareConfig = mareConfig;
-        _serverManager = serverManager;
+        _tokenProvider = tokenProvider;
-        _httpClient = new();
+        _httpClient = new()
-        _httpClient.Timeout = TimeSpan.FromSeconds(3000);
+        {
+            Timeout = TimeSpan.FromSeconds(3000)
+        };
         var ver = Assembly.GetExecutingAssembly().GetName().Version;
         _httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("MareSynchronos", ver!.Major + "." + ver!.Minor + "." + ver!.Build));
 
@@ -48,12 +51,12 @@ public class FileTransferOrchestrator : DisposableMediatorSubscriberBase
     }
 
     public Uri? FilesCdnUri { private set; get; }
-    public List<FileTransfer> ForbiddenTransfers { get; } = new();
+    public List<FileTransfer> ForbiddenTransfers { get; } = [];
     public bool IsInitialized => FilesCdnUri != null;
 
-    public void ReleaseDownloadSlot()
+    public void ClearDownloadRequest(Guid guid)
     {
-        _downloadSemaphore.Release();
+        _downloadReady.Remove(guid, out _);
     }
 
     public bool IsDownloadReady(Guid guid)
@@ -66,12 +69,12 @@ public class FileTransferOrchestrator : DisposableMediatorSubscriberBase
         return false;
     }
 
-    public void ClearDownloadRequest(Guid guid)
+    public void ReleaseDownloadSlot()
     {
-        _downloadReady.Remove(guid, out _);
+        _downloadSemaphore.Release();
     }
 
-    public async Task<HttpResponseMessage> SendRequestAsync(HttpMethod method, Uri uri, 
+    public async Task<HttpResponseMessage> SendRequestAsync(HttpMethod method, Uri uri,
         CancellationToken? ct = null, HttpCompletionOption httpCompletionOption = HttpCompletionOption.ResponseContentRead)
     {
         using var requestMessage = new HttpRequestMessage(method, uri);
@@ -109,10 +112,10 @@ public class FileTransferOrchestrator : DisposableMediatorSubscriberBase
         await _downloadSemaphore.WaitAsync(token).ConfigureAwait(false);
     }
 
-    private async Task<HttpResponseMessage> SendRequestInternalAsync(HttpRequestMessage requestMessage, 
+    private async Task<HttpResponseMessage> SendRequestInternalAsync(HttpRequestMessage requestMessage,
         CancellationToken? ct = null, HttpCompletionOption httpCompletionOption = HttpCompletionOption.ResponseContentRead)
     {
-        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _serverManager.GetToken());
+        requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await _tokenProvider.GetOrUpdateToken(ct!.Value).ConfigureAwait(false));
 
         if (requestMessage.Content != null && requestMessage.Content is not StreamContent && requestMessage.Content is not ByteArrayContent)
         {

MareSynchronos/WebAPI/Files/FileUploadManager.cs

@@ -39,7 +39,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
         });
     }
 
-    public List<FileTransfer> CurrentUploads { get; } = new();
+    public List<FileTransfer> CurrentUploads { get; } = [];
     public bool IsUploading => CurrentUploads.Count > 0;
 
     public bool CancelUpload()
@@ -81,7 +81,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
 
         foreach (var kvp in data.FileReplacements)
         {
-            data.FileReplacements[kvp.Key].RemoveAll(i => _orchestrator.ForbiddenTransfers.Any(f => string.Equals(f.Hash, i.Hash, StringComparison.OrdinalIgnoreCase)));
+            data.FileReplacements[kvp.Key].RemoveAll(i => _orchestrator.ForbiddenTransfers.Exists(f => string.Equals(f.Hash, i.Hash, StringComparison.OrdinalIgnoreCase)));
         }
 
         return data;
@@ -102,7 +102,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
             UIDs = uids
         };
         var response = await _orchestrator.SendRequestAsync(HttpMethod.Post, MareFiles.ServerFilesFilesSendFullPath(_orchestrator.FilesCdnUri!), filesSendDto, ct).ConfigureAwait(false);
-        return await response.Content.ReadFromJsonAsync<List<UploadFileDto>>(cancellationToken: ct).ConfigureAwait(false) ?? new List<UploadFileDto>();
+        return await response.Content.ReadFromJsonAsync<List<UploadFileDto>>(cancellationToken: ct).ConfigureAwait(false) ?? [];
     }
 
     private HashSet<string> GetUnverifiedFiles(CharacterData data)
@@ -152,7 +152,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
             if (!_mareConfigService.Current.UseAlternativeFileUpload && ex is not OperationCanceledException)
             {
                 Logger.LogWarning(ex, "[{hash}] Error during file upload, trying alternative file upload", fileHash);
-                await UploadFileStream(compressedFile, fileHash, true, uploadToken).ConfigureAwait(false);
+                await UploadFileStream(compressedFile, fileHash, munged: true, uploadToken).ConfigureAwait(false);
             }
             else
             {
@@ -196,7 +196,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
         unverifiedUploadHashes = unverifiedUploadHashes.Where(h => _fileDbManager.GetFileCacheByHash(h) != null).ToHashSet(StringComparer.Ordinal);
 
         Logger.LogDebug("Verifying {count} files", unverifiedUploadHashes.Count);
-        var filesToUpload = await FilesSend(unverifiedUploadHashes.ToList(), visiblePlayers.Select(p => p.UID).ToList(), uploadToken).ConfigureAwait(false);
+        var filesToUpload = await FilesSend([.. unverifiedUploadHashes], visiblePlayers.Select(p => p.UID).ToList(), uploadToken).ConfigureAwait(false);
 
         foreach (var file in filesToUpload.Where(f => !f.IsForbidden))
         {
@@ -215,7 +215,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
 
         foreach (var file in filesToUpload.Where(c => c.IsForbidden))
         {
-            if (_orchestrator.ForbiddenTransfers.All(f => !string.Equals(f.Hash, file.Hash, StringComparison.Ordinal)))
+            if (_orchestrator.ForbiddenTransfers.TrueForAll(f => !string.Equals(f.Hash, file.Hash, StringComparison.Ordinal)))
             {
                 _orchestrator.ForbiddenTransfers.Add(new UploadFileTransfer(file)
                 {
@@ -248,7 +248,7 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase
             Logger.LogDebug("Upload complete, compressed {size} to {compressed}", UiSharedService.ByteToString(totalSize), UiSharedService.ByteToString(compressedSize));
         }
 
-        foreach (var file in unverifiedUploadHashes.Where(c => !CurrentUploads.Any(u => string.Equals(u.Hash, c, StringComparison.Ordinal))))
+        foreach (var file in unverifiedUploadHashes.Where(c => !CurrentUploads.Exists(u => string.Equals(u.Hash, c, StringComparison.Ordinal))))
         {
             _verifiedUploadedHashes[file] = DateTime.UtcNow;
         }

MareSynchronos/WebAPI/Files/Models/DownloadFileTransfer.cs

@@ -4,8 +4,11 @@ namespace MareSynchronos.WebAPI.Files.Models;
 
 public class DownloadFileTransfer : FileTransfer
 {
-    private DownloadFileDto Dto => (DownloadFileDto)TransferDto;
+    public DownloadFileTransfer(DownloadFileDto dto) : base(dto)
-    public DownloadFileTransfer(DownloadFileDto dto) : base(dto) { }
+    {
+    }
+
+    public override bool CanBeTransferred => Dto.FileExists && !Dto.IsForbidden && Dto.Size > 0;
     public Uri DownloadUri => new(Dto.Url);
     public override long Total
     {
@@ -15,6 +18,5 @@ public class DownloadFileTransfer : FileTransfer
         }
         get => Dto.Size;
     }
-
+    private DownloadFileDto Dto => (DownloadFileDto)TransferDto;
-    public override bool CanBeTransferred => Dto.FileExists && !Dto.IsForbidden && Dto.Size > 0;
 }

MareSynchronos/WebAPI/Files/Models/DownloadStatus.cs

@@ -7,4 +7,4 @@ public enum DownloadStatus
     WaitingForQueue,
     Downloading,
     Decompressing
-}
+}

MareSynchronos/WebAPI/Files/Models/FileDownloadStatus.cs

@@ -3,8 +3,8 @@
 public class FileDownloadStatus
 {
     public DownloadStatus DownloadStatus { get; set; }
-    public int TotalFiles { get; set; }
-    public int TransferredFiles { get; set; }
     public long TotalBytes { get; set; }
+    public int TotalFiles { get; set; }
     public long TransferredBytes { get; set; }
-}
+    public int TransferredFiles { get; set; }
+}